瀏覽代碼

精简分页方言

miemie 4 年之前
父節點
當前提交
5892dca434

+ 1 - 2
TEMP_CHANGELOG.md

@@ -4,7 +4,6 @@
 - feat: mybatis up to `3.5.5`, mybatis-spring up to `2.0.5`
 - feat: jsqlparser up to `3.2`
 - feat: 新增 `MybatisParameterHandler` 并废弃老的 `MybatisDefaultParameterHandler`
-- feat: 分页方言加入 gbase,clickhouse 支持
+- feat: 分页方言加入 gbase,clickhouse,oscar 支持
 - feat: Wrapper 新增api `not(boolean condition, Consumer<Param> consumer)`
 - feat: 新增 `MybatisPlusInterceptor` 解决 多租户和分页 插件一级和二级缓存不正确问题
-- feat: 新增 神通数据分页方言

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

@@ -16,10 +16,10 @@
 package com.baomidou.mybatisplus.extension.plugins.pagination;
 
 import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.DialectRegistry;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.IDialect;
@@ -85,10 +85,9 @@ public class DialectFactory {
     public static IDialect getDialect(String dialectClazz) {
         return CollectionUtils.computeIfAbsent(DIALECT_CACHE, dialectClazz, ClassUtils::newInstance);
     }
-    
+
     public static IDialect getDialect(DbType dbType) {
         return Optional.ofNullable(DIALECT_REGISTRY.getDialect(dbType))
-            .orElseThrow(() -> new MybatisPlusException(String.format("%s database not supported.", dbType.getDb())));
+            .orElseThrow(() -> ExceptionUtils.mpe("%s database not supported.", dbType.getDb()));
     }
-    
 }

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

@@ -90,6 +90,8 @@ public class JdbcUtils {
             return DbType.PHOENIX;
         } else if (jdbcUrl.contains(":zenith:")) {
             return DbType.GAUSS;
+        } else if (jdbcUrl.contains(":gbase:")) {
+            return DbType.GBASE;
         } else if (jdbcUrl.contains(":clickhouse:")) {
             return DbType.CLICKHOUSE;
         } else if (jdbcUrl.contains(":oscar:")) {