From 238c5484b64112dd6e0ceab6c651c044fbe3f6c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= Date: Fri, 17 Mar 2023 09:24:57 +0800 Subject: [PATCH] optimize for sql delimiter --- .../com/mybatisflex/core/dialect/CommonsDialectImpl.java | 6 +++--- .../com/mybatisflex/core/query/DistinctQueryColumn.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/CommonsDialectImpl.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/CommonsDialectImpl.java index 843c6dec..40f324e7 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/CommonsDialectImpl.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/CommonsDialectImpl.java @@ -280,7 +280,7 @@ public class CommonsDialectImpl implements IDialect { index++; } } - sqlBuilder.append(" FROM ").append(StringUtil.join(",", queryTables, queryTable -> queryTable.toSql(this))); + sqlBuilder.append(" FROM ").append(StringUtil.join(", ", queryTables, queryTable -> queryTable.toSql(this))); buildJoinSql(sqlBuilder, queryWrapper, allTables); buildWhereSql(sqlBuilder, queryWrapper, allTables); @@ -306,7 +306,7 @@ public class CommonsDialectImpl implements IDialect { //ignore selectColumns StringBuilder sqlBuilder = new StringBuilder("SELECT COUNT(*) FROM "); - sqlBuilder.append(StringUtil.join(",", queryTables, queryTable -> queryTable.toSql(this))); + sqlBuilder.append(StringUtil.join(", ", queryTables, queryTable -> queryTable.toSql(this))); buildJoinSql(sqlBuilder, queryWrapper, allTables); @@ -329,7 +329,7 @@ public class CommonsDialectImpl implements IDialect { //ignore selectColumns StringBuilder sqlBuilder = new StringBuilder("DELETE FROM "); - sqlBuilder.append(StringUtil.join(",", queryTables, queryTable -> queryTable.toSql(this))); + sqlBuilder.append(StringUtil.join(", ", queryTables, queryTable -> queryTable.toSql(this))); buildJoinSql(sqlBuilder, queryWrapper, allTables); buildWhereSql(sqlBuilder, queryWrapper, allTables); diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/DistinctQueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/DistinctQueryColumn.java index 5aa5f96e..bfa67e45 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/DistinctQueryColumn.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/DistinctQueryColumn.java @@ -34,7 +34,7 @@ public class DistinctQueryColumn extends QueryColumn { if (CollectionUtil.isEmpty(queryTables)) { return ""; } - return " DISTINCT " + StringUtil.join(",", queryColumns, queryColumn -> + return " DISTINCT " + StringUtil.join(", ", queryColumns, queryColumn -> queryColumn.toSelectSql(queryTables, dialect)); } }