优化常量名,更直观契合

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

@@ -29,11 +29,11 @@ public class H2Dialect implements IDialect {
 
     @Override
     public DialectModel buildPaginationSql(String originalSql, long offset, long limit) {
-        String sql = originalSql + " limit " + LIMIT;
+        String sql = originalSql + " limit " + FIRST_MARK;
         boolean existOffset = false;
         if (offset > 0) {
             existOffset = true;
-            sql += (" offset " + OFFSET);
+            sql += (" offset " + SECOND_MARK);
         }
         DialectModel model = new DialectModel(sql, limit, offset);
         return existOffset ? model.setConsumerChain() : model.setConsumer(true);

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

@@ -30,7 +30,7 @@ public class HSQLDialect implements IDialect {
 
     @Override
     public DialectModel buildPaginationSql(String originalSql, long offset, long limit) {
-        String sql = originalSql + " limit " + OFFSET + StringPool.COMMA + LIMIT;
+        String sql = originalSql + " limit " + FIRST_MARK + StringPool.COMMA + SECOND_MARK;
         return new DialectModel(sql, offset, limit).setConsumerChain();
     }
 }

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

@@ -31,8 +31,8 @@ public interface IDialect {
      * 这俩没什么特殊意义
      * 只是为了实现类方便使用,以及区分分页 sql 的参数
      */
-    String LIMIT = StringPool.QUESTION_MARK;
-    String OFFSET = StringPool.QUESTION_MARK;
+    String FIRST_MARK = StringPool.QUESTION_MARK;
+    String SECOND_MARK = StringPool.QUESTION_MARK;
 
     /**
      * 组装分页语句

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

@@ -30,7 +30,7 @@ public class MySqlDialect implements IDialect {
 
     @Override
     public DialectModel buildPaginationSql(String originalSql, long offset, long limit) {
-        String sql = originalSql + " LIMIT " + OFFSET + StringPool.COMMA + LIMIT;
+        String sql = originalSql + " LIMIT " + FIRST_MARK + StringPool.COMMA + SECOND_MARK;
         return new DialectModel(sql, offset, limit).setConsumerChain();
     }
 }

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

@@ -31,7 +31,7 @@ public class OracleDialect implements IDialect {
     public DialectModel buildPaginationSql(String originalSql, long offset, long limit) {
         limit = (offset >= 1) ? (offset + limit) : limit;
         String sql = "SELECT * FROM ( SELECT TMP.*, ROWNUM ROW_ID FROM ( " +
-            originalSql + " ) TMP WHERE ROWNUM <=" + LIMIT + ") WHERE ROW_ID > " + OFFSET;
+            originalSql + " ) TMP WHERE ROWNUM <=" + FIRST_MARK + ") WHERE ROW_ID > " + SECOND_MARK;
         return new DialectModel(sql, limit, offset).setConsumerChain();
     }
 }

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

@@ -29,7 +29,7 @@ public class PostgreDialect implements IDialect {
 
     @Override
     public DialectModel buildPaginationSql(String originalSql, long offset, long limit) {
-        String sql = originalSql + " limit " + LIMIT + " offset " + OFFSET;
+        String sql = originalSql + " limit " + FIRST_MARK + " offset " + SECOND_MARK;
         return new DialectModel(sql, limit, offset).setConsumerChain();
     }
 }

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

@@ -66,7 +66,7 @@ public class SQLServer2005Dialect implements IDialect {
             " ROW_NUMBER() OVER (" + orderby + ") as __row_number__, " + pagingBuilder +
             ") SELECT * FROM selectTemp WHERE __row_number__ BETWEEN " +
             //FIX#299：原因：mysql中limit 10(offset,size) 是从第10开始（不包含10）,；而这里用的BETWEEN是两边都包含，所以改为offset+1
-            OFFSET + " AND " + LIMIT + " ORDER BY __row_number__";
+            FIRST_MARK + " AND " + SECOND_MARK + " ORDER BY __row_number__";
         return new DialectModel(sql, offset + 1, offset + limit).setConsumerChain();
     }
 }

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

@@ -29,7 +29,7 @@ public class SQLServerDialect implements IDialect {
 
     @Override
     public DialectModel buildPaginationSql(String originalSql, long offset, long limit) {
-        String sql = originalSql + " OFFSET " + OFFSET + " ROWS FETCH NEXT " + LIMIT + " ROWS ONLY";
+        String sql = originalSql + " OFFSET " + FIRST_MARK + " ROWS FETCH NEXT " + SECOND_MARK + " ROWS ONLY";
         return new DialectModel(sql, offset, limit).setConsumerChain();
     }
 }

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

@@ -29,7 +29,7 @@ public class SQLiteDialect implements IDialect {
 
     @Override
     public DialectModel buildPaginationSql(String originalSql, long offset, long limit) {
-        String sql = originalSql + " limit " + LIMIT + " offset " + OFFSET;
+        String sql = originalSql + " limit " + FIRST_MARK + " offset " + SECOND_MARK;
         return new DialectModel(sql, limit, offset).setConsumerChain();
     }
 }