miemie 1 vuosi sitten
vanhempi
commit
7d265e14a0

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

@@ -197,11 +197,11 @@ public enum DbType {
     /**
      * trino
      */
-    TRINO("trino", "trino数据库"),
+    TRINO("trino", "Trino数据库"),
     /**
-     * trino
+     * presto
      */
-    PRESTO("Presto", "Presto数据库"),
+    PRESTO("presto", "Presto数据库"),
     /**
      * UNKNOWN DB
      */

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

@@ -18,7 +18,6 @@ package com.baomidou.mybatisplus.extension.plugins.pagination;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.*;
-import com.cq.idp.config.TrinoDialect;
 
 import java.util.EnumMap;
 import java.util.Map;

+ 0 - 28
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/FirebirdDialect.java

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2011-2023, baomidou (jobob@qq.com).
- *
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.extension.plugins.pagination.dialects;
-
-/**
- * Firebird 数据库分页语句组装实现,SQL测试版本为4.0
- * 备注:The FIRST/SKIP and ROWS clause are non-standard alternatives
- *
- * @author cdtjj
- * @since 2022-04-26
- * @deprecated 2022-05-30
- */
-@Deprecated
-public class FirebirdDialect extends Oracle12cDialect {
-}

+ 0 - 28
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/GBaseInfromixDialect.java

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2011-2023, baomidou (jobob@qq.com).
- *
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.extension.plugins.pagination.dialects;
-
-/**
- * GBase 8s V8.8 数据库分页语句组装实现
- * 通用分页版本
- *
- * @author lix lixhbs@163.com
- * @since 2022年03月28日19:25:46
- * @deprecated 2022-05-30
- */
-@Deprecated
-public class GBaseInfromixDialect extends GBase8sDialect {
-}

+ 0 - 28
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/GBasedbtDialect.java

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2011-2023, baomidou (jobob@qq.com).
- *
- * 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
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.extension.plugins.pagination.dialects;
-
-/**
- * GBase 8s V8.8 数据库分页语句组装实现
- * 通用分页版本
- *
- * @author liaojinqing
- * @since 2021-07-20
- * @deprecated 2022-05-30
- */
-@Deprecated
-public class GBasedbtDialect extends GBase8sDialect {
-}

+ 1 - 2
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/TrinoDialect.java

@@ -1,7 +1,6 @@
-package com.cq.idp.config;
+package com.baomidou.mybatisplus.extension.plugins.pagination.dialects;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.DialectModel;
-import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.IDialect;
 
 /**
  * Trino 数据库分页语句组装实现

+ 2 - 9
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/XCloudDialect.java

@@ -24,20 +24,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.DialectModel;
  * @since 2022-04-13
  */
 public class XCloudDialect implements IDialect {
-    /**
-     *
-     * @param originalSql
-     * @param offset
-     * @param limit
-     * @return
-     */
 
     @Override
     public DialectModel buildPaginationSql(String originalSql, long offset, long limit) {
         StringBuilder sql = new StringBuilder(originalSql).append(" LIMIT ");
         if (offset != 0L) {
-            sql.append(" ("+FIRST_MARK +","+SECOND_MARK+") ") ;
-            return new DialectModel(sql.toString(), offset+1, offset+limit).setConsumerChain();
+            sql.append(" (" + FIRST_MARK + "," + SECOND_MARK + ") ");
+            return new DialectModel(sql.toString(), offset + 1, offset + limit).setConsumerChain();
         } else {
             sql.append(FIRST_MARK);
             return new DialectModel(sql.toString(), limit).setConsumer(true);