From a6e1099b22afa51a13c3d38878cfcf509d0c24ad Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Wed, 28 Jun 2023 21:41:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E5=9C=A8=20Wrapp?= =?UTF-8?q?erUtil.withAlias=20=E6=96=B9=E6=B3=95=E4=B8=AD=E5=A4=84?= =?UTF-8?q?=E7=90=86=20alias=20=E5=8C=85=E8=A3=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mybatisflex/core/query/ArithmeticQueryColumn.java | 2 +- .../main/java/com/mybatisflex/core/query/CaseQueryColumn.java | 2 +- .../java/com/mybatisflex/core/query/CaseSearchQueryColumn.java | 2 +- .../java/com/mybatisflex/core/query/FunctionQueryColumn.java | 2 +- .../main/java/com/mybatisflex/core/query/SelectQueryColumn.java | 2 +- .../main/java/com/mybatisflex/core/query/SelectQueryTable.java | 2 +- .../com/mybatisflex/core/query/StringFunctionQueryColumn.java | 2 +- .../src/main/java/com/mybatisflex/core/query/WrapperUtil.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/ArithmeticQueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/ArithmeticQueryColumn.java index 5eb00c9b..600a7432 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/ArithmeticQueryColumn.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/ArithmeticQueryColumn.java @@ -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(); } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseQueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseQueryColumn.java index 1bd24d32..a6eb0cd6 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseQueryColumn.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseQueryColumn.java @@ -44,7 +44,7 @@ public class CaseQueryColumn extends QueryColumn implements HasParamsColumn { String toSelectSql(List 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; } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseSearchQueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseSearchQueryColumn.java index 96946703..e8335326 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseSearchQueryColumn.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseSearchQueryColumn.java @@ -37,7 +37,7 @@ public class CaseSearchQueryColumn extends QueryColumn implements HasParamsColum String toSelectSql(List 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; } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/FunctionQueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/FunctionQueryColumn.java index 22bdba2b..13b0c1c9 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/FunctionQueryColumn.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/FunctionQueryColumn.java @@ -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 diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryColumn.java index b10f48b4..0c285ba1 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryColumn.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryColumn.java @@ -45,7 +45,7 @@ public class SelectQueryColumn extends QueryColumn implements HasParamsColumn { String toSelectSql(List 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; } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryTable.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryTable.java index 565c3b68..1433bafc 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryTable.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryTable.java @@ -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); } diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/StringFunctionQueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/StringFunctionQueryColumn.java index 582bafc1..0659febd 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/StringFunctionQueryColumn.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/StringFunctionQueryColumn.java @@ -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 diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WrapperUtil.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WrapperUtil.java index b1a91d24..b0c452b9 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WrapperUtil.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WrapperUtil.java @@ -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) {