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

refactor: 统一在 WrapperUtil.withAlias 方法中处理 alias 包裹。

Browse Source
This commit is contained in:
Suomm 2023-06-28 21:41:22 +08:00
parent 690100bebd
commit a6e1099b22
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@ public class ArithmeticQueryColumn extends QueryColumn {
sql.append(arithmeticInfos.get(i).toSql(queryTables, dialect, i));
}
if (StringUtil.isNotBlank(alias)) {
return WrapperUtil.withAlias(sql.toString(), dialect.wrap(alias), dialect);
return WrapperUtil.withAlias(sql.toString(), alias, dialect);
}
return sql.toString();
}

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

@ -44,7 +44,7 @@ public class CaseQueryColumn extends QueryColumn implements HasParamsColumn {
String toSelectSql(List<QueryTable> queryTables, IDialect dialect) {
String sql = buildSql(queryTables, dialect);
if (StringUtil.isNotBlank(alias)) {
return WrapperUtil.withAlias(sql, dialect.wrap(alias), dialect);
return WrapperUtil.withAlias(sql, alias, dialect);
}
return sql;
}

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

@ -37,7 +37,7 @@ public class CaseSearchQueryColumn extends QueryColumn implements HasParamsColum
String toSelectSql(List<QueryTable> queryTables, IDialect dialect) {
String sql = buildSql(queryTables, dialect);
if (StringUtil.isNotBlank(alias)) {
return WrapperUtil.withAlias(sql, dialect.wrap(alias), dialect);
return WrapperUtil.withAlias(sql, alias, dialect);
}
return sql;
}

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

@ -78,7 +78,7 @@ public class FunctionQueryColumn extends QueryColumn implements HasParamsColumn
if (StringUtil.isBlank(alias)) {
return fnName + WrapperUtil.withBracket(sql);
}
return fnName + WrapperUtil.withAlias(sql, dialect.wrap(alias), dialect);
return fnName + WrapperUtil.withAlias(sql, alias, dialect);
}
@Override

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

@ -45,7 +45,7 @@ public class SelectQueryColumn extends QueryColumn implements HasParamsColumn {
String toSelectSql(List<QueryTable> queryTables, IDialect dialect) {
String selectSql = dialect.forSelectByQuery(queryWrapper);
if (StringUtil.isNotBlank(selectSql) && StringUtil.isNotBlank(alias)) {
selectSql = WrapperUtil.withAlias(selectSql, dialect.wrap(alias), dialect);
selectSql = WrapperUtil.withAlias(selectSql, alias, dialect);
}
return selectSql;
}

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

@ -49,7 +49,7 @@ public class SelectQueryTable extends QueryTable {
public String toSql(IDialect dialect) {
String sql = dialect.buildSelectSql(queryWrapper);
if (StringUtil.isNotBlank(alias)) {
return WrapperUtil.withAlias(sql, dialect.wrap(alias), dialect);
return WrapperUtil.withAlias(sql, alias, dialect);
} else {
return WrapperUtil.withBracket(sql);
}

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

@ -65,7 +65,7 @@ public class StringFunctionQueryColumn extends QueryColumn {
if (StringUtil.isBlank(alias)) {
return fnName + WrapperUtil.withBracket(sql);
}
return fnName + WrapperUtil.withAlias(sql, dialect.wrap(alias), dialect);
return fnName + WrapperUtil.withAlias(sql, alias, dialect);
}
@Override

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

@ -147,7 +147,7 @@ class WrapperUtil {
}
static String withAlias(String sql, String alias, IDialect dialect) {
return SqlConsts.BRACKET_LEFT + sql + SqlConsts.BRACKET_RIGHT + getAsKeyWord(dialect) + alias;
return SqlConsts.BRACKET_LEFT + sql + SqlConsts.BRACKET_RIGHT + getAsKeyWord(dialect) + dialect.wrap(alias);
}
static String buildAlias(String alias, IDialect dialect) {