Browse Source

优化新增星瑞格数据库支持

hubin 2 years ago
parent
commit
8cad4770ef

+ 1 - 1
license.txt

@@ -10,4 +10,4 @@ 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.  
+limitations under the License.

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

@@ -97,9 +97,9 @@ public class DialectFactory {
                 || dbType == DbType.GBASEDBT
                 || dbType == DbType.GBASE_INFORMIX) {
                 dialect = new GBase8sDialect();
-            }else if(dbType==DbType.INFORMIX){
+            } else if (dbType == DbType.INFORMIX) {
                 dialect = new InformixDialect();
-            }else if (dbType==DbType.SINODB){
+            } else if (dbType == DbType.SINODB) {
                 dialect = new SinoDBDialect();
             }
             DIALECT_ENUM_MAP.put(dbType, dialect);

+ 4 - 6
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/InformixDialect.java

@@ -16,15 +16,13 @@
 package com.baomidou.mybatisplus.extension.plugins.pagination.dialects;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.DialectModel;
-public class InformixDialect implements IDialect{
+
+public class InformixDialect implements IDialect {
+
     @Override
     public DialectModel buildPaginationSql(String originalSql, long offset, long limit) {
-        /*StringBuilder ret = new StringBuilder();
-        ret.append(String.format("select skip %s first %s ", FIRST_MARK+"",SECOND_MARK+""));
-        ret.append(originalSql.replaceFirst("(?i)select", ""));
-        return new DialectModel(ret.toString(), offset, limit).setConsumerChain();*/
         StringBuilder ret = new StringBuilder();
-        ret.append(String.format("select skip %s first %s ", offset+"",limit+""));
+        ret.append(String.format("select skip %s first %s ", offset + "", limit + ""));
         ret.append(originalSql.replaceFirst("(?i)select", ""));
         return new DialectModel(ret.toString());
     }

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

@@ -18,8 +18,7 @@ package com.baomidou.mybatisplus.extension.plugins.pagination.dialects;
 import com.baomidou.mybatisplus.extension.plugins.pagination.DialectModel;
 
 /**
- * GBase 8s V8.8 数据库分页语句组装实现
- * 通用分页版本
+ * 星瑞格数据库分页语句组装实现
  *
  * @author wujl
  * @since 2023-05-23

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

@@ -135,9 +135,9 @@ public class JdbcUtils {
             return DbType.TDENGINE;
         } else if (url.contains(":informix")) {
             return DbType.INFORMIX;
-        } else if (url.contains(":sinodb")) {  //目前sinodb的连接用informix的连接串
+        } else if (url.contains(":sinodb")) {
             return DbType.SINODB;
-        }else if (url.contains(":uxdb:")) {
+        } else if (url.contains(":uxdb:")) {
             return DbType.UXDB;
         } else {
             logger.warn("The jdbcUrl is " + jdbcUrl + ", Mybatis Plus Cannot Read Database type or The Database's Not Supported!");