统一 DbType 类型

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/enums/DBType.java → mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/DbType.java

@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.baomidou.mybatisplus.extension.enums;
+package com.baomidou.mybatisplus.annotation;
 
-import com.baomidou.mybatisplus.core.enums.IDBType;
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
+
+import lombok.Getter;
 
 /**
  * <p>
@@ -24,10 +24,10 @@ import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
  * </p>
  *
  * @author hubin
- * @since 2016-04-15
+ * @since 2018-06-09
  */
-//TODO: 3.0 如何在GlobalConfiguration里面支持？
-public enum DBType implements IDBType {
+@Getter
+public enum DbType {
     /**
      * MYSQL
      */
@@ -59,15 +59,15 @@ public enum DBType implements IDBType {
     /**
      * POSTGRE
      */
-    POSTGRE("postgresql", "\"%s\"", "Postgre数据库"),
+    POSTGRE_SQL("postgresql", "\"%s\"", "Postgre数据库"),
     /**
      * SQLSERVER2005
      */
-    SQLSERVER2005("sqlserver2005", null, "SQLServer2005数据库"),
+    SQL_SERVER2005("sqlserver2005", null, "SQLServer2005数据库"),
     /**
      * SQLSERVER
      */
-    SQLSERVER("sqlserver", null, "SQLServer数据库"),
+    SQL_SERVER("sqlserver", null, "SQLServer数据库"),
     /**
      * UNKONWN DB
      */
@@ -79,7 +79,7 @@ public enum DBType implements IDBType {
 
     private final String desc;
 
-    DBType(final String db, final String quote, final String desc) {
+    DbType(final String db, final String quote, final String desc) {
         this.db = db;
         this.quote = quote;
         this.desc = desc;
@@ -93,28 +93,14 @@ public enum DBType implements IDBType {
      * @param dbType 数据库类型字符串
      * @return
      */
-    public static DBType getDBType(String dbType) {
-        DBType[] dts = DBType.values();
-        for (DBType dt : dts) {
+    public static DbType getDbType(String dbType) {
+        DbType[] dts = DbType.values();
+        for (DbType dt : dts) {
             if (dt.getDb().equalsIgnoreCase(dbType)) {
                 return dt;
             }
         }
-        throw new MybatisPlusException("Error: Unknown database type, or do not support changing database!\n");
-    }
-
-    @Override
-    public String getDb() {
-        return this.db;
-    }
-
-    @Override
-    public String getQuote() {
-        return this.quote;
-    }
-
-    public String getDesc() {
-        return this.desc;
+        return OTHER;
     }
 
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/config/DbConfig.java

@@ -1,8 +1,8 @@
 package com.baomidou.mybatisplus.core.config;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.core.enums.IDBType;
 import com.baomidou.mybatisplus.core.handlers.SqlReservedWordsHandler;
 import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
 
@@ -21,7 +21,7 @@ public class DbConfig {
     /**
      * 数据库类型
      */
-    private IDBType dbType;
+    private DbType dbType;
     /**
      * 主键类型（默认 ID_WORKER）
      */

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/enums/IDBType.java

@@ -1,17 +0,0 @@
-package com.baomidou.mybatisplus.core.enums;
-
-/**
- * <p>
- * DBType 抽象接口
- * </p>
- *
- * @author yuxiaobin
- * @since 2018/2/7
- */
-public interface IDBType {
-
-    //TODO: 3.0
-    String getQuote();
-
-    String getDb();
-}

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/handlers/SqlReservedWordsHandler.java

@@ -5,9 +5,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import com.baomidou.mybatisplus.core.config.DbConfig;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.core.enums.IDBType;
+import com.baomidou.mybatisplus.annotation.DbType;
 
 /**
  * <p>
@@ -131,7 +129,7 @@ public abstract class SqlReservedWordsHandler {
         Collections.addAll(RESERVED_WORDS, words);
     }
 
-    public abstract String convert(IDBType dbType, String column);
+    public abstract String convert(DbType dbType, String column);
 
     public boolean addAll(Collection<String> reservedWords) {
         return RESERVED_WORDS.addAll(reservedWords);
@@ -156,7 +154,7 @@ public abstract class SqlReservedWordsHandler {
         return new SqlReservedWordsHandler() {
 
             @Override
-            public String convert(IDBType dbType, String column) {
+            public String convert(DbType dbType, String column) {
                 // default do nothing
                 return column;
             }

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

@@ -4,6 +4,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.config.DbConfig;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
@@ -13,7 +14,6 @@ import org.apache.ibatis.session.SqlSessionFactory;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.core.enums.IDBType;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
@@ -125,7 +125,7 @@ public class GlobalConfigUtils {
         return cache;
     }
 
-    public static IDBType getDbType(Configuration configuration) {
+    public static DbType getDbType(Configuration configuration) {
         return getGlobalConfig(configuration).getDbConfig().getDbType();
     }
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/PaginationInterceptor.java

@@ -36,8 +36,8 @@ import org.apache.ibatis.reflection.SystemMetaObject;
 import org.apache.ibatis.scripting.defaults.DefaultParameterHandler;
 import org.apache.ibatis.session.RowBounds;
 
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.MybatisDefaultParameterHandler;
-import com.baomidou.mybatisplus.core.enums.IDBType;
 import com.baomidou.mybatisplus.core.pagination.PageHelper;
 import com.baomidou.mybatisplus.core.pagination.Pagination;
 import com.baomidou.mybatisplus.core.parser.ISqlParser;
@@ -45,7 +45,6 @@ import com.baomidou.mybatisplus.core.parser.SqlInfo;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlUtils;
-import com.baomidou.mybatisplus.extension.enums.DBType;
 import com.baomidou.mybatisplus.extension.handlers.SqlParserHandler;
 import com.baomidou.mybatisplus.extension.plugins.pagination.DialectFactory;
 import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils;
@@ -119,7 +118,7 @@ public class PaginationInterceptor extends SqlParserHandler implements Intercept
         String originalSql = boundSql.getSql();
         Connection connection = (Connection) invocation.getArgs()[0];
         //TODO: 3.0
-        IDBType dbType = StringUtils.isNotEmpty(dialectType) ? DBType.getDBType(dialectType) : JdbcUtils.getDbType(connection.getMetaData().getURL());
+        DbType dbType = StringUtils.isNotEmpty(dialectType) ? DbType.getDbType(dialectType) : JdbcUtils.getDbType(connection.getMetaData().getURL());
         if (rowBounds instanceof Pagination) {
             Pagination page = (Pagination) rowBounds;
             boolean orderBy = true;

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/SqlExplainInterceptor.java

@@ -35,10 +35,10 @@ import org.apache.ibatis.plugin.Signature;
 import org.apache.ibatis.scripting.defaults.DefaultParameterHandler;
 import org.apache.ibatis.session.Configuration;
 
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.enums.DBType;
 import com.baomidou.mybatisplus.extension.toolkit.VersionUtils;
 
 /**
@@ -75,7 +75,7 @@ public class SqlExplainInterceptor implements Interceptor {
             BoundSql boundSql = ms.getBoundSql(parameter);
             Connection connection = executor.getTransaction().getConnection();
             String databaseVersion = connection.getMetaData().getDatabaseProductVersion();
-            if (GlobalConfigUtils.getDbType(configuration).equals(DBType.MYSQL)
+            if (GlobalConfigUtils.getDbType(configuration).equals(DbType.MYSQL)
                 && VersionUtils.compare(minMySQLVersion, databaseVersion)) {
                 logger.warn("Warn: Your mysql version needs to be greater than '5.6.3' to execute of Sql Explain!");
                 return invocation.proceed();

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/DialectFactory.java

@@ -20,13 +20,12 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.ibatis.session.RowBounds;
 
-import com.baomidou.mybatisplus.core.enums.IDBType;
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.pagination.PageHelper;
 import com.baomidou.mybatisplus.core.pagination.Pagination;
 import com.baomidou.mybatisplus.core.pagination.dialect.IDialect;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.enums.DBType;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.DB2Dialect;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.H2Dialect;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.HSQLDialect;
@@ -65,7 +64,7 @@ public class DialectFactory {
      * @return
      * @throws Exception
      */
-    public static String buildPaginationSql(Pagination page, String buildSql, IDBType dbType, String dialectClazz)
+    public static String buildPaginationSql(Pagination page, String buildSql, DbType dbType, String dialectClazz)
         throws Exception {
         // fix #172, 196
         return getDialect(dbType, dialectClazz).buildPaginationSql(buildSql, PageHelper.offsetCurrent(page), page.getSize());
@@ -82,7 +81,7 @@ public class DialectFactory {
      * @return
      * @throws Exception
      */
-    public static String buildPaginationSql(RowBounds rowBounds, String buildSql, IDBType dbType, String dialectClazz)
+    public static String buildPaginationSql(RowBounds rowBounds, String buildSql, DbType dbType, String dialectClazz)
         throws Exception {
         // fix #196
         return getDialect(dbType, dialectClazz).buildPaginationSql(buildSql, rowBounds.getOffset(), rowBounds.getLimit());
@@ -98,7 +97,7 @@ public class DialectFactory {
      * @return
      * @throws Exception
      */
-    private static IDialect getDialect(IDBType dbType, String dialectClazz) throws Exception {
+    private static IDialect getDialect(DbType dbType, String dialectClazz) throws Exception {
         IDialect dialect = DIALECT_CACHE.get(dbType.getDb());
         if (null == dialect) {
             // 自定义方言
@@ -138,35 +137,35 @@ public class DialectFactory {
      * @return
      * @throws Exception
      */
-    private static IDialect getDialectByDbType(IDBType dbType) {
-        if (dbType == DBType.MYSQL) {
+    private static IDialect getDialectByDbType(DbType dbType) {
+        if (dbType == DbType.MYSQL) {
             return new MySqlDialect();
         }
-        if (dbType == DBType.MARIADB) {
+        if (dbType == DbType.MARIADB) {
             return new MariaDBDialect();
         }
-        if (dbType == DBType.ORACLE) {
+        if (dbType == DbType.ORACLE) {
             return new OracleDialect();
         }
-        if (dbType == DBType.DB2) {
+        if (dbType == DbType.DB2) {
             return new DB2Dialect();
         }
-        if (dbType == DBType.H2) {
+        if (dbType == DbType.H2) {
             return new H2Dialect();
         }
-        if (dbType == DBType.SQLSERVER) {
+        if (dbType == DbType.SQL_SERVER) {
             return new SQLServerDialect();
         }
-        if (dbType == DBType.SQLSERVER2005) {
+        if (dbType == DbType.SQL_SERVER2005) {
             return new SQLServer2005Dialect();
         }
-        if (dbType == DBType.POSTGRE) {
+        if (dbType == DbType.POSTGRE_SQL) {
             return new PostgreDialect();
         }
-        if (dbType == DBType.HSQL) {
+        if (dbType == DbType.HSQL) {
             return new HSQLDialect();
         }
-        if (dbType == DBType.SQLITE) {
+        if (dbType == DbType.SQLITE) {
             return new SQLiteDialect();
         }
         throw new MybatisPlusException("The Database's Not Supported! DBType:" + dbType);

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/JdbcUtils.java

@@ -18,10 +18,9 @@ package com.baomidou.mybatisplus.extension.toolkit;
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 
-import com.baomidou.mybatisplus.core.enums.IDBType;
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.extension.enums.DBType;
 
 /**
  * <p>
@@ -43,34 +42,34 @@ public class JdbcUtils {
      * @param jdbcUrl 连接地址
      * @return
      */
-    public static IDBType getDbType(String jdbcUrl) {
+    public static DbType getDbType(String jdbcUrl) {
         if (StringUtils.isEmpty(jdbcUrl)) {
             throw new MybatisPlusException("Error: The jdbcUrl is Null, Cannot read database type");
         }
         if (jdbcUrl.startsWith("jdbc:mysql:") || jdbcUrl.startsWith("jdbc:cobar:")
             || jdbcUrl.startsWith("jdbc:log4jdbc:mysql:")) {
-            return DBType.MYSQL;
+            return DbType.MYSQL;
         } else if (jdbcUrl.startsWith("jdbc:mariadb:")) {
-            return DBType.MARIADB;
+            return DbType.MARIADB;
         } else if (jdbcUrl.startsWith("jdbc:oracle:") || jdbcUrl.startsWith("jdbc:log4jdbc:oracle:")) {
-            return DBType.ORACLE;
+            return DbType.ORACLE;
         } else if (jdbcUrl.startsWith("jdbc:sqlserver:") || jdbcUrl.startsWith("jdbc:microsoft:")) {
-            return DBType.SQLSERVER2005;
+            return DbType.SQL_SERVER2005;
         } else if (jdbcUrl.startsWith("jdbc:sqlserver2012:")) {
-            return DBType.SQLSERVER;
+            return DbType.SQL_SERVER;
         } else if (jdbcUrl.startsWith("jdbc:postgresql:") || jdbcUrl.startsWith("jdbc:log4jdbc:postgresql:")) {
-            return DBType.POSTGRE;
+            return DbType.POSTGRE_SQL;
         } else if (jdbcUrl.startsWith("jdbc:hsqldb:") || jdbcUrl.startsWith("jdbc:log4jdbc:hsqldb:")) {
-            return DBType.HSQL;
+            return DbType.HSQL;
         } else if (jdbcUrl.startsWith("jdbc:db2:")) {
-            return DBType.DB2;
+            return DbType.DB2;
         } else if (jdbcUrl.startsWith("jdbc:sqlite:")) {
-            return DBType.SQLITE;
+            return DbType.SQLITE;
         } else if (jdbcUrl.startsWith("jdbc:h2:") || jdbcUrl.startsWith("jdbc:log4jdbc:h2:")) {
-            return DBType.H2;
+            return DbType.H2;
         } else {
             logger.warn("The jdbcUrl is " + jdbcUrl + ", Mybatis Plus Cannot Read Database type or The Database's Not Supported!");
-            return DBType.OTHER;
+            return DbType.OTHER;
         }
     }
 

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/DataSourceConfig.java

@@ -19,10 +19,11 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.generator.config.converts.*;
 import com.baomidou.mybatisplus.generator.config.querys.*;
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/IDbQuery.java

@@ -18,7 +18,7 @@ package com.baomidou.mybatisplus.generator.config;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
+import com.baomidou.mybatisplus.annotation.DbType;
 
 /**
  * <p>

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

@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
 import com.baomidou.mybatisplus.generator.config.ConstVal;
@@ -40,7 +41,6 @@ import com.baomidou.mybatisplus.generator.config.TemplateConfig;
 import com.baomidou.mybatisplus.generator.config.po.TableField;
 import com.baomidou.mybatisplus.generator.config.po.TableFill;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 
 /**

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/DB2Query.java

@@ -15,7 +15,7 @@
  */
 package com.baomidou.mybatisplus.generator.config.querys;
 
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
+import com.baomidou.mybatisplus.annotation.DbType;
 
 /**
  * <p>

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/MariadbQuery.java

@@ -15,11 +15,11 @@
  */
 package com.baomidou.mybatisplus.generator.config.querys;
 
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
-
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import com.baomidou.mybatisplus.annotation.DbType;
+
 /**
  * <p>
  * MySql 表数据查询

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/MySqlQuery.java

@@ -18,7 +18,7 @@ package com.baomidou.mybatisplus.generator.config.querys;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
+import com.baomidou.mybatisplus.annotation.DbType;
 
 /**
  * <p>

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/OracleQuery.java

@@ -15,7 +15,7 @@
  */
 package com.baomidou.mybatisplus.generator.config.querys;
 
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
+import com.baomidou.mybatisplus.annotation.DbType;
 
 /**
  * <p>

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/PostgreSqlQuery.java

@@ -15,7 +15,7 @@
  */
 package com.baomidou.mybatisplus.generator.config.querys;
 
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
+import com.baomidou.mybatisplus.annotation.DbType;
 
 /**
  * <p>

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/querys/SqlServerQuery.java

@@ -18,7 +18,7 @@ package com.baomidou.mybatisplus.generator.config.querys;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
+import com.baomidou.mybatisplus.annotation.DbType;
 
 /**
  * <p>

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/DbType.java

@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2011-2020, hubin (jobob@qq.com).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.baomidou.mybatisplus.generator.config.rules;
-
-/**
- * <p>
- * 数据库类型定义
- * </p>
- *
- * @author YangHu hubin
- * @since 2016-08-30
- */
-public enum DbType {
-    MYSQL("mysql"),
-    MARIADB("mariadb"),
-    ORACLE("oracle"),
-    DB2("db2"),
-    H2("h2"),
-    HSQL("hsql"),
-    SQLITE("sqlite"),
-    SQL_SERVER("sql_server"),
-    POSTGRE_SQL("postgre_sql"),
-    OTHER("other db");
-
-
-    private final String value;
-
-
-    DbType(String value) {
-        this.value = value;
-    }
-
-
-    public String getValue() {
-        return value;
-    }
-
-}

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/CodeGeneratorTest.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
 import com.baomidou.mybatisplus.generator.config.GlobalConfig;
 import com.baomidou.mybatisplus.generator.config.PackageConfig;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 
 /**

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/DB2Generator.java

@@ -5,17 +5,16 @@ import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
 import com.baomidou.mybatisplus.generator.config.GlobalConfig;
 import com.baomidou.mybatisplus.generator.config.PackageConfig;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 
 public class DB2Generator {
-	
+
 	public static void main(String[] args) {
 		String packageName = "com.crea.gwms";
         boolean serviceNameStartWithI = true;//user -> UserService, 设置成true: user -> IUserService
         generateByTables(serviceNameStartWithI, packageName, "USER");
 	}
-	
+
 	public static void generateByTables(boolean serviceNameStartWithI, String packageName, String... tableNames) {
         GlobalConfig config = new GlobalConfig();
         String dbUrl = "jdbc:db2://192.168.0.227:50000/TRADECTR";
@@ -58,5 +57,5 @@ public class DB2Generator {
     private void generateByTables(String packageName, String... tableNames) {
         generateByTables(true, packageName, tableNames);
     }
-    
+
 }

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java

@@ -34,7 +34,6 @@ import com.baomidou.mybatisplus.generator.config.converts.MySqlTypeConvert;
 import com.baomidou.mybatisplus.generator.config.po.TableFill;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
 

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/PostgreSQLGenerator.java

@@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.converts.OracleTypeConvert;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
 

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/SQLServerGenerator.java

@@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.converts.SqlServerTypeConvert;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;