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

fixed groupBy error; close #I7EAY9

Browse Source
This commit is contained in:
开源海哥 2023-06-18 11:54:02 +08:00
parent fb5488c3fe
commit e6505f1e27
6 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/DistinctQueryColumn.java
View File

@ -35,8 +35,23 @@ public class DistinctQueryColumn extends QueryColumn {
if (CollectionUtil.isEmpty(queryTables)) {
return SqlConsts.EMPTY;
}
String sql = SqlConsts.DISTINCT + StringUtil.join(SqlConsts.DELIMITER, queryColumns, queryColumn ->
queryColumn.toSelectSql(queryTables, dialect));
return sql + WrapperUtil.buildAlias(alias, dialect);
}
@Override
String toConditionSql(List<QueryTable> queryTables, IDialect dialect) {
if (CollectionUtil.isEmpty(queryTables)) {
return SqlConsts.EMPTY;
}
return SqlConsts.DISTINCT + StringUtil.join(SqlConsts.DELIMITER, queryColumns, queryColumn ->
queryColumn.toSelectSql(queryTables, dialect));
}
@Override

9
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/FunctionQueryColumn.java
View File

@ -81,6 +81,15 @@ public class FunctionQueryColumn extends QueryColumn implements HasParamsColumn
return fnName + WrapperUtil.withAlias(sql, dialect.wrap(alias));
}
@Override
String toConditionSql(List<QueryTable> queryTables, IDialect dialect) {
String sql = column.toSelectSql(queryTables, dialect);
if (StringUtil.isBlank(sql)) {
return SqlConsts.EMPTY;
}
return fnName + WrapperUtil.withBracket(sql);
}
@Override
public QueryColumn as(String alias) {
SqlUtil.keepColumnSafely(alias);

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

@ -506,7 +506,7 @@ public class QueryColumn implements CloneSupport<QueryColumn> {
String toSelectSql(List<QueryTable> queryTables, IDialect dialect) {
return toConditionSql(queryTables, dialect) + WrapperUtil.withAliasIf(alias, dialect);
return toConditionSql(queryTables, dialect) + WrapperUtil.buildAlias(alias, dialect);
}

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryTable.java
View File

@ -98,9 +98,9 @@ public class QueryTable implements CloneSupport<QueryTable> {
public String toSql(IDialect dialect) {
String sql;
if (StringUtil.isNotBlank(schema)) {
sql = dialect.wrap(dialect.getRealSchema(schema)) + "." + dialect.wrap(dialect.getRealTable(name)) + WrapperUtil.withAliasIf(alias, dialect);
sql = dialect.wrap(dialect.getRealSchema(schema)) + "." + dialect.wrap(dialect.getRealTable(name)) + WrapperUtil.buildAlias(alias, dialect);
} else {
sql = dialect.wrap(dialect.getRealTable(name)) + WrapperUtil.withAliasIf(alias, dialect);
sql = dialect.wrap(dialect.getRealTable(name)) + WrapperUtil.buildAlias(alias, dialect);
}
return sql;
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WrapperUtil.java
View File

@ -149,7 +149,7 @@ class WrapperUtil {
return SqlConsts.BRACKET_LEFT + sql + SqlConsts.BRACKET_RIGHT + SqlConsts.AS + alias;
}
static String withAliasIf(String alias, IDialect dialect) {
static String buildAlias(String alias, IDialect dialect) {
return StringUtil.isBlank(alias) ? SqlConsts.EMPTY : SqlConsts.AS + dialect.wrap(alias);
}
}

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

@ -263,6 +263,15 @@ public class AccountSqlTester {
System.out.println(sql);
}
@Test
public void testGroup_I7EAY9() {
QueryWrapper query = QueryWrapper.create()
.from(ACCOUNT).as("a")
.from(ACCOUNT01).as("b")
.groupBy(year(ACCOUNT.BIRTHDAY));
System.out.println(query.toSQL());
}
@Test
public void testHavingSql() {
QueryWrapper queryWrapper = QueryWrapper.create()