Browse Source

调整生成器策略属性名称.

nieqiuqiu 5 years ago
parent
commit
9092579e6e

+ 3 - 3
mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/StrategyConfig.java

@@ -164,13 +164,13 @@ public class StrategyConfig {
      */
      */
     private List<TableFill> tableFillList = null;
     private List<TableFill> tableFillList = null;
     /**
     /**
-     * 启用like匹配支持
-     * 数据库语法不能支持使用like过滤表的话,可以考虑关闭此开关.
+     * 启用sql过滤
+     * 语法不能支持使用sql过滤表的话,可以考虑关闭此开关.
      * 目前所知微软系需要关闭,其他数据库等待反馈,sql可能要改动一下才能支持,没数据库环境搞,请手动关闭使用内存过滤的方式。
      * 目前所知微软系需要关闭,其他数据库等待反馈,sql可能要改动一下才能支持,没数据库环境搞,请手动关闭使用内存过滤的方式。
      *
      *
      * @since 3.3.1
      * @since 3.3.1
      */
      */
-    private boolean enableLike = true;
+    private boolean enableSqlFilter = true;
     /**
     /**
      * 包含表名
      * 包含表名
      *
      *

+ 8 - 8
mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java

@@ -460,19 +460,19 @@ public class ConfigBuilder {
                 tablesSql = String.format(tablesSql, schema);
                 tablesSql = String.format(tablesSql, schema);
             }
             }
             StringBuilder sql = new StringBuilder(tablesSql);
             StringBuilder sql = new StringBuilder(tablesSql);
-            if (config.isEnableLike()) {
+            if (config.isEnableSqlFilter()) {
                 if (config.getLikeTable() != null) {
                 if (config.getLikeTable() != null) {
                     sql.append(" AND ").append(dbQuery.tableName()).append(" LIKE '").append(config.getLikeTable().getValue()).append("'");
                     sql.append(" AND ").append(dbQuery.tableName()).append(" LIKE '").append(config.getLikeTable().getValue()).append("'");
                 } else if (config.getNotLikeTable() != null) {
                 } else if (config.getNotLikeTable() != null) {
                     sql.append(" AND ").append(dbQuery.tableName()).append(" NOT LIKE '").append(config.getNotLikeTable().getValue()).append("'");
                     sql.append(" AND ").append(dbQuery.tableName()).append(" NOT LIKE '").append(config.getNotLikeTable().getValue()).append("'");
                 }
                 }
-            }
-            if (isInclude) {
-                sql.append(" AND ").append(dbQuery.tableName()).append(" IN (")
-                    .append(Arrays.stream(config.getInclude()).map(tb -> "'" + tb + "'").collect(Collectors.joining(","))).append(")");
-            } else if (isExclude) {
-                sql.append(" AND ").append(dbQuery.tableName()).append(" NOT IN (")
-                    .append(Arrays.stream(config.getExclude()).map(tb -> "'" + tb + "'").collect(Collectors.joining(","))).append(")");
+                if (isInclude) {
+                    sql.append(" AND ").append(dbQuery.tableName()).append(" IN (")
+                        .append(Arrays.stream(config.getInclude()).map(tb -> "'" + tb + "'").collect(Collectors.joining(","))).append(")");
+                } else if (isExclude) {
+                    sql.append(" AND ").append(dbQuery.tableName()).append(" NOT IN (")
+                        .append(Arrays.stream(config.getExclude()).map(tb -> "'" + tb + "'").collect(Collectors.joining(","))).append(")");
+                }
             }
             }
             TableInfo tableInfo;
             TableInfo tableInfo;
             try (PreparedStatement preparedStatement = connection.prepareStatement(sql.toString());
             try (PreparedStatement preparedStatement = connection.prepareStatement(sql.toString());

+ 4 - 2
mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/H2CodeGeneratorTest.java

@@ -18,6 +18,8 @@ import org.junit.jupiter.api.Test;
  */
  */
 class H2CodeGeneratorTest {
 class H2CodeGeneratorTest {
 
 
+    private static String outPutDir = System.getProperty("os.name").toLowerCase().contains("windows") ? "D://tmp" : "tmp";
+
     private DataSourceConfig dataSourceConfig() {
     private DataSourceConfig dataSourceConfig() {
         String dbUrl = "jdbc:h2:mem:test;MODE=mysql;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE";
         String dbUrl = "jdbc:h2:mem:test;MODE=mysql;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE";
         DataSourceConfig dataSourceConfig = new DataSourceConfig();
         DataSourceConfig dataSourceConfig = new DataSourceConfig();
@@ -34,7 +36,7 @@ class H2CodeGeneratorTest {
         strategyConfig
         strategyConfig
             .setCapitalMode(true)
             .setCapitalMode(true)
             .setEntityLombokModel(false)
             .setEntityLombokModel(false)
-            .setEnableLike(true)
+            .setEnableSqlFilter(true)
             .setNaming(NamingStrategy.underline_to_camel);
             .setNaming(NamingStrategy.underline_to_camel);
         return strategyConfig;
         return strategyConfig;
     }
     }
@@ -44,7 +46,7 @@ class H2CodeGeneratorTest {
         globalConfig.setActiveRecord(false)
         globalConfig.setActiveRecord(false)
             .setIdType(IdType.ASSIGN_ID)
             .setIdType(IdType.ASSIGN_ID)
             .setAuthor("test")
             .setAuthor("test")
-            .setOutputDir("/tmp/")
+            .setOutputDir(outPutDir)
             .setOpen(true)
             .setOpen(true)
             .setFileOverride(true);
             .setFileOverride(true);
         return globalConfig;
         return globalConfig;