admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-08 01:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: join self error; close #I7M3ZW

Browse Source
This commit is contained in:
开源海哥 2023-07-19 11:18:31 +08:00
parent 655c11a5c6
commit 5161079a78
4 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Join.java
View File

@ -57,6 +57,14 @@ public class Join implements CloneSupport<Join> {
public void on(QueryCondition condition) {
if (condition.column != null){
QueryTable table = condition.column.getTable();
if (queryTable.isSameTable(table)){
QueryColumn newColumn = condition.column.clone();
newColumn.table.alias = queryTable.alias;
condition.column = newColumn;
}
}
this.on = condition;
}

17
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
View File

@ -555,30 +555,35 @@ public class QueryColumn implements CloneSupport<QueryColumn> {
}
QueryTable getSelectTable(List<QueryTable> queryTables, QueryTable columnTable) {
QueryTable getSelectTable(List<QueryTable> queryTables, QueryTable selfTable) {
//未查询任何表
if (queryTables == null || queryTables.isEmpty()) {
return null;
}
if (queryTables.size() == 1 && queryTables.get(0).isSameTable(columnTable)) {
if (selfTable != null && StringUtil.isNotBlank(selfTable.alias)){
return selfTable;
}
if (queryTables.size() == 1 && queryTables.get(0).isSameTable(selfTable)) {
//ignore table
return null;
}
if (CollectionUtil.isEmpty(queryTables)) {
return columnTable;
return selfTable;
}
if (columnTable == null && queryTables.size() == 1) {
if (selfTable == null && queryTables.size() == 1) {
return queryTables.get(0);
}
for (QueryTable table : queryTables) {
if (table.isSameTable(columnTable)) {
if (table.isSameTable(selfTable)) {
return table;
}
}
return columnTable;
return selfTable;
}

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryCondition.java
View File

@ -172,6 +172,7 @@ public class QueryCondition implements CloneSupport<QueryCondition> {
}
//列
sql.append(getColumn().toConditionSql(queryTables, dialect));
//逻辑符号
sql.append(logic);

18
mybatis-flex-core/src/test/java/com/mybatisflex/coretest/AccountSqlTester.java
View File

@ -348,6 +348,24 @@ public class AccountSqlTester {
System.out.println(sql);
}
@Test
public void testJoinSelf() {
QueryWrapper queryWrapper = QueryWrapper.create()
.select()
.from(ACCOUNT)
.leftJoin(ACCOUNT).as("a1").on(ACCOUNT.ID.eq(ACCOUNT.AGE))
.where(ACCOUNT.AGE.ge(10));
System.out.println(queryWrapper.toSQL());
QueryWrapper queryWrapper1 = QueryWrapper.create()
.select(ACCOUNT.ID)
.from(ACCOUNT)
.where(ACCOUNT.AGE.ge(10));
System.out.println(queryWrapper1.toSQL());
}
@Test
public void testOrderBySql() {