移除全局配置的 dbType 和 columnLike

mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/DbType.java

@@ -15,6 +15,7 @@
  */
 package com.baomidou.mybatisplus.annotation;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**
@@ -24,76 +25,66 @@ import lombok.Getter;
  * @since 2018-06-23
  */
 @Getter
+@AllArgsConstructor
 public enum DbType {
     /**
      * MYSQL
      */
-    MYSQL("mysql", "%s LIKE CONCAT('%%',#{%s},'%%')", "MySql数据库"),
+    MYSQL("mysql", "MySql数据库"),
     /**
      * MARIADB
      */
-    MARIADB("mariadb", "%s LIKE CONCAT('%%',#{%s},'%%')", "MariaDB数据库"),
+    MARIADB("mariadb", "MariaDB数据库"),
     /**
      * ORACLE
      */
-    ORACLE("oracle", "%s LIKE CONCAT(CONCAT('%%',#{%s}),'%%')", "Oracle数据库"),
+    ORACLE("oracle", "Oracle数据库"),
     /**
      * DB2
      */
-    DB2("db2", "%s LIKE CONCAT(CONCAT('%%',#{%s}),'%%')", "DB2数据库"),
+    DB2("db2", "DB2数据库"),
     /**
      * H2
      */
-    H2("h2", "%s LIKE CONCAT('%%',#{%s},'%%')", "H2数据库"),
+    H2("h2", "H2数据库"),
     /**
      * HSQL
      */
-    HSQL("hsql", "%s LIKE CONCAT('%%',#{%s},'%%')", "HSQL数据库"),
+    HSQL("hsql", "HSQL数据库"),
     /**
      * SQLITE
      */
-    SQLITE("sqlite", "%s LIKE CONCAT('%%',#{%s},'%%')", "SQLite数据库"),
+    SQLITE("sqlite", "SQLite数据库"),
     /**
      * POSTGRE
      */
-    POSTGRE_SQL("postgresql", "%s LIKE CONCAT('%%',#{%s},'%%')", "Postgre数据库"),
+    POSTGRE_SQL("postgresql", "Postgre数据库"),
     /**
      * SQLSERVER2005
      */
-    SQL_SERVER2005("sqlserver2005", "%s LIKE '%%'+#{%s}+'%%'", "SQLServer2005数据库"),
+    SQL_SERVER2005("sqlserver2005", "SQLServer2005数据库"),
     /**
      * SQLSERVER
      */
-    SQL_SERVER("sqlserver", "%s LIKE '%%'+#{%s}+'%%'", "SQLServer数据库"),
+    SQL_SERVER("sqlserver", "SQLServer数据库"),
     /**
      * DM
      */
-    DM("dm", null, "达梦数据库"),
+    DM("dm", "达梦数据库"),
     /**
      * UNKONWN DB
      */
-    OTHER("other", null, "其他数据库");
+    OTHER("other", "其他数据库");
 
     /**
      * 数据库名称
      */
     private final String db;
-    /**
-     * LIKE 拼接模式
-     */
-    private final String like;
     /**
      * 描述
      */
     private final String desc;
 
-
-    DbType(String db, String like, String desc) {
-        this.db = db;
-        this.like = like;
-        this.desc = desc;
-    }
-
     /**
      * 获取数据库类型（默认 MySql）
      *

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

@@ -15,7 +15,6 @@
  */
 package com.baomidou.mybatisplus.core.config;
 
-import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
@@ -101,14 +100,6 @@ public class GlobalConfig implements Serializable {
 
     @Data
     public static class DbConfig {
-
-        /**
-         * 数据库类型
-         *
-         * @deprecated 3.1.1 不再需要, mp不应该也不需要关心数据库类型
-         */
-        @Deprecated
-        private DbType dbType = DbType.OTHER;
         /**
          * 主键类型（默认 ID_WORKER）
          */
@@ -135,13 +126,6 @@ public class GlobalConfig implements Serializable {
          * 表名、是否使用下划线命名（默认 true:默认数据库表下划线命名）
          */
         private boolean tableUnderline = true;
-        /**
-         * String 类型字段 LIKE
-         *
-         * @deprecated 3.1.1 后续将删除这个属性
-         */
-        @Deprecated
-        private boolean columnLike = false;
         /**
          * 大写命名
          */

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

@@ -122,6 +122,7 @@ public class TableFieldInfo implements Constants {
     private String update;
     /**
      * where 字段比较条件
+     * todo 待优化
      */
     private String condition = SqlCondition.EQUAL;
     /**
@@ -204,9 +205,6 @@ public class TableFieldInfo implements Constants {
         if (StringUtils.isNotEmpty(tableField.condition())) {
             // 细粒度条件控制
             this.condition = tableField.condition();
-        } else {
-            // 全局配置
-            this.setCondition(dbConfig);
         }
 
         // 字段是否注入查询
@@ -297,9 +295,6 @@ public class TableFieldInfo implements Constants {
         if (StringUtils.isNotEmpty(tableField.condition())) {
             // 细粒度条件控制
             this.condition = tableField.condition();
-        } else {
-            // 全局配置
-            this.setCondition(dbConfig);
         }
 
         // 字段是否注入查询
@@ -319,7 +314,6 @@ public class TableFieldInfo implements Constants {
         this.insertStrategy = dbConfig.getInsertStrategy();
         this.updateStrategy = dbConfig.getUpdateStrategy();
         this.whereStrategy = dbConfig.getSelectStrategy();
-        this.setCondition(dbConfig);
         tableInfo.setLogicDelete(this.initLogicDelete(dbConfig, field));
 
         String column = field.getName();
@@ -373,18 +367,6 @@ public class TableFieldInfo implements Constants {
         return StringUtils.isNotEmpty(logicDeleteValue);
     }
 
-    /**
-     * 全局配置开启字段 LIKE 并且为字符串类型字段
-     * <p>注入 LIKE 查询！！！</p>
-     */
-    private void setCondition(GlobalConfig.DbConfig dbConfig) {
-        if (null == condition || SqlCondition.EQUAL.equals(condition)) {
-            if (dbConfig.isColumnLike() && isCharSequence) {
-                condition = dbConfig.getDbType().getLike();
-            }
-        }
-    }
-
     /**
      * 获取 select sql 片段
      *