sql 脚本加几个换行符

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableFieldInfo.java

@@ -15,24 +15,18 @@
  */
 package com.baomidou.mybatisplus.core.metadata;
 
-import java.lang.reflect.Field;
-
-import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.SqlCondition;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.TableInfoHelper;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
-
 import lombok.AccessLevel;
 import lombok.Getter;
 
+import java.lang.reflect.Field;
+
 /**
  * <p>
  * 数据库表字段反射信息

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableInfo.java

@@ -15,12 +15,6 @@
  */
 package com.baomidou.mybatisplus.core.metadata;
 
-import static java.util.stream.Collectors.joining;
-
-import java.util.List;
-
-import org.apache.ibatis.session.Configuration;
-
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.KeySequence;
@@ -30,11 +24,15 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
-
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Setter;
 import lombok.experimental.Accessors;
+import org.apache.ibatis.session.Configuration;
+
+import java.util.List;
+
+import static java.util.stream.Collectors.joining;
 
 /**
  * <p>
@@ -209,7 +207,8 @@ public class TableInfo {
             if (idType == IdType.AUTO) {
                 return "";
             }
-            return SqlScriptUtils.HASH_LEFT_BRACE + keyProperty + StringPool.RIGHT_BRACE + StringPool.COMMA;
+            return SqlScriptUtils.HASH_LEFT_BRACE + keyProperty + StringPool.RIGHT_BRACE +
+                StringPool.COMMA + StringPool.NEWLINE;
         }
         return "";
     }
@@ -226,7 +225,7 @@ public class TableInfo {
             if (idType == IdType.AUTO) {
                 return "";
             }
-            return keyColumn + StringPool.COMMA;
+            return keyColumn + StringPool.COMMA + StringPool.NEWLINE;
         }
         return "";
     }
@@ -241,7 +240,7 @@ public class TableInfo {
      */
     public String getAllInsertSqlProperty() {
         return getKeyInsertSqlProperty() + fieldList.stream().map(TableFieldInfo::getInsertSqlProperty)
-            .collect(joining(StringPool.EMPTY));
+            .collect(joining(StringPool.NEWLINE));
     }
 
     /**
@@ -253,7 +252,7 @@ public class TableInfo {
      */
     public String getAllInsertSqlColumn() {
         return getKeyInsertSqlColumn() + fieldList.stream().map(TableFieldInfo::getInsertSqlColumn)
-            .collect(joining(StringPool.EMPTY));
+            .collect(joining(StringPool.NEWLINE));
     }
 
     /**

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlScriptUtils.java

@@ -63,7 +63,7 @@ public final class SqlScriptUtils {
      */
     public static String convertTrim(String sqlScript, String prefix, String suffix, String prefixOverride,
                                      String suffixOverrides) {
-        StringBuilder sb = new StringBuilder("<trim");
+        StringBuilder sb = new StringBuilder(StringPool.NEWLINE).append("<trim");
         if (StringUtils.isNotEmpty(prefix)) {
             sb.append(StringPool.SPACE).append("prefix=\"").append(prefix).append(StringPool.QUOTE);
         }
@@ -77,6 +77,6 @@ public final class SqlScriptUtils {
             sb.append(StringPool.SPACE).append("suffixOverrides=\"").append(suffixOverrides).append(StringPool.QUOTE);
         }
         return sb.append(StringPool.RIGHT_CHEV).append(StringPool.NEWLINE).append(sqlScript)
-            .append(StringPool.NEWLINE).append("</trim>").toString();
+            .append(StringPool.NEWLINE).append("</trim>").append(StringPool.NEWLINE).toString();
     }
 }