refactor: 增加对MSSQL的schemaName的支持

Author: davidfantasy

src/main/java/com/github/davidfantasy/mybatisplus/generatorui/GeneratorConfig.java

@@ -1,5 +1,6 @@
 package com.github.davidfantasy.mybatisplus.generatorui;
 
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.generator.config.ITypeConvert;
 import com.baomidou.mybatisplus.generator.config.rules.DateType;
@@ -8,6 +9,8 @@
 import lombok.Builder;
 import lombok.Data;
 
+import java.util.Objects;
+
 @Builder
 @Data
 public class GeneratorConfig {
@@ -28,7 +31,7 @@ public class GeneratorConfig {
     private String jdbcUrl;
 
     /**
-     * 数据库schema,POSTGRE_SQL,ORACLE,DB2类型的数据库需要指定
+     * 数据库schema,POSTGRE_SQL,ORACLE,DB2，MSSQL类型的数据库需要指定
      */
     private String schemaName;
 
@@ -47,21 +50,11 @@ public class GeneratorConfig {
      */
     private String driverClassName = "com.mysql.cj.jdbc.Driver";
 
-    /**
-     * PostgreSQL的schema name
-     */
-    private String postgreSQLschema;
-
     /**
      * 数据库时间类型与java class的对应策略
      */
     private DateType dateType;
 
-    /**
-     * 开启 ActiveRecord 模式
-     */
-    private boolean activeRecord = false;
-
     /**
      * 注入自定义模板参数
      */
@@ -98,5 +91,4 @@ public DateType getDateType() {
         return dateType;
     }
 
-
 }

src/main/java/com/github/davidfantasy/mybatisplus/generatorui/dbquery/DbQueryHolder.java

@@ -0,0 +1,35 @@
+package com.github.davidfantasy.mybatisplus.generatorui.dbquery;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
+import com.baomidou.mybatisplus.generator.config.IDbQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+@Component
+public class DbQueryHolder {
+
+    @Autowired
+    private DataSourceConfig dataSourceConfig;
+
+    private final Map<DbType, IDbQuery> dbQueryMap = new EnumMap<>(DbType.class);
+
+    public DbQueryHolder() {
+        dbQueryMap.put(DbType.SQL_SERVER, new SqlServerQuery());
+    }
+
+    /**
+     * 先查找本地是否有自定义的query实现，没有的话再去找mp内置的dbquery
+     */
+    public IDbQuery getDbQuery(DbType dbType) {
+        IDbQuery dbQuery = dbQueryMap.get(dbType);
+        if (dbQuery != null) {
+            return dbQuery;
+        }
+        return dataSourceConfig.getDbQuery();
+    }
+
+}

src/main/java/com/github/davidfantasy/mybatisplus/generatorui/dbquery/SqlServerQuery.java

@@ -0,0 +1,16 @@
+package com.github.davidfantasy.mybatisplus.generatorui.dbquery;
+
+public class SqlServerQuery extends com.baomidou.mybatisplus.generator.config.querys.SqlServerQuery {
+
+    /**
+     * 相对于MP原版增加了以SCHEMA作为过滤条件
+     */
+    @Override
+    public String tablesSql() {
+        return "select a.TABLE_NAME,b.COMMENTS from INFORMATION_SCHEMA.TABLES a left join \n" +
+                "(select cast(so.name as varchar(500)) as TABLE_NAME, cast(sep.value as varchar(500)) as COMMENTS from sysobjects so left JOIN sys.extended_properties sep on sep.major_id = so.id and sep.minor_id = 0 where (xtype = 'U' or xtype = 'v')) b \n" +
+                "on a.TABLE_NAME = b.TABLE_NAME\n" +
+                "where a.TABLE_SCHEMA = '%s'";
+    }
+
+}

src/main/java/com/github/davidfantasy/mybatisplus/generatorui/mbp/MbpGenerator.java

@@ -139,6 +139,7 @@ private void configTemplate(TemplateConfig.Builder builder, List<String> choosed
         }
     }
 
+    //自定义模板参数配置
     private void configInjection(InjectionConfig.Builder builder, UserConfig userConfig, GenSetting genSetting) {
         //自定义参数
         builder.beforeOutputFile((tableInfo, objectMap) -> {
@@ -159,6 +160,9 @@ private void configInjection(InjectionConfig.Builder builder, UserConfig userCon
                 controllerMethodsVar.put("hasMethod", true);
             }
             vars.put("controllerMethods", controllerMethodsVar);
+            if(!StrUtil.isEmpty(generatorConfig.getSchemaName())){
+                vars.put("schemaName", generatorConfig.getSchemaName()+".");
+            }
             objectMap.putAll(vars);
         });
         //自定义文件生成

src/main/java/com/github/davidfantasy/mybatisplus/generatorui/service/DatabaseService.java

@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
 import com.baomidou.mybatisplus.generator.config.IDbQuery;
+import com.github.davidfantasy.mybatisplus.generatorui.dbquery.DbQueryHolder;
 import com.github.davidfantasy.mybatisplus.generatorui.dto.TableInfo;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,8 +23,11 @@ public class DatabaseService {
     @Autowired
     private DataSourceConfig dataSourceConfig;
 
+    @Autowired
+    private DbQueryHolder dbQueryHolder;
+
     public List<TableInfo> getTablesFromDb() {
-        IDbQuery dbQuery = dataSourceConfig.getDbQuery();
+        IDbQuery dbQuery = dbQueryHolder.getDbQuery(dataSourceConfig.getDbType());
         List<Map<String, Object>> results = jdbcTemplate.queryForList(getTableSql());
         List<TableInfo> tableInfos = Lists.newArrayList();
         for (Map<String, Object> table : results) {
@@ -36,7 +40,7 @@ public List<TableInfo> getTablesFromDb() {
     }
 
     public String getTableSql() {
-        String tablesSql = dataSourceConfig.getDbQuery().tablesSql();
+        String tablesSql = dbQueryHolder.getDbQuery(dataSourceConfig.getDbType()).tablesSql();
         String schema = dataSourceConfig.getSchemaName();
         if (schema == null) {
             schema = getDefaultSchema();
@@ -61,6 +65,9 @@ private String getDefaultSchema() {
         } else if (DbType.ORACLE == dbType) {
             //oracle 默认 schema=username
             schema = Objects.requireNonNull(dataSourceConfig.getUsername()).toUpperCase();
+        } else if (DbType.SQL_SERVER == dbType) {
+            //SQL_SERVER 2005以上 默认 schema=dbo
+            schema = "dbo";
         }
         return schema;
     }