Преглед на файлове

分页查询兼容注释情况

wangyao преди 2 години
родител
ревизия
5a3791b530

+ 2 - 2
magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/DB2Dialect.java

@@ -18,7 +18,7 @@ public class DB2Dialect implements Dialect {
 	public String getPageSql(String sql, BoundSql boundSql, long offset, long limit) {
 		boundSql.addParameter(offset + 1);
 		boundSql.addParameter(offset + limit);
-		return "SELECT * FROM (SELECT TMP_PAGE.*,ROWNUMBER() OVER() AS ROW_ID FROM ( " + sql +
-				" ) AS TMP_PAGE) TMP_PAGE WHERE ROW_ID BETWEEN ? AND ?";
+		return "SELECT * FROM (SELECT TMP_PAGE.*,ROWNUMBER() OVER() AS ROW_ID FROM ( \n" + sql +
+				"\n ) AS TMP_PAGE) TMP_PAGE WHERE ROW_ID BETWEEN ? AND ?";
 	}
 }

+ 1 - 1
magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/Dialect.java

@@ -44,7 +44,7 @@ public interface Dialect {
 	 * @return 分页 count SQL
 	 */
 	default String getCountSql(String sql) {
-		return "select count(1) from (" + REPLACE_ORDER_BY.matcher(sql).replaceAll("") + ") count_";
+		return "select count(1) from ( \n" + REPLACE_ORDER_BY.matcher(sql).replaceAll("") + "\n ) count_";
 	}
 
 	/**

+ 2 - 2
magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/DmDialect.java

@@ -19,8 +19,8 @@ public class DmDialect implements Dialect {
 		limit = (offset >= 1) ? (offset + limit) : limit;
 		boundSql.addParameter(limit);
 		boundSql.addParameter(offset);
-		return "SELECT * FROM ( SELECT TMP.*, ROWNUM ROW_ID FROM ( " +
-				sql + " ) TMP WHERE ROWNUM <= ? ) WHERE ROW_ID > ?";
+		return "SELECT * FROM ( SELECT TMP.*, ROWNUM ROW_ID FROM ( \n" +
+				sql + "\n ) TMP WHERE ROWNUM <= ? ) WHERE ROW_ID > ?";
 	}
 }
 

+ 1 - 1
magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/KingbaseSQLDialect.java

@@ -19,6 +19,6 @@ public class KingbaseSQLDialect implements Dialect {
 	public String getPageSql(String sql, BoundSql boundSql, long offset, long limit) {
 		boundSql.addParameter(limit);
 		boundSql.addParameter(offset);
-		return sql + " limit ? offset ?";
+		return sql + "\n limit ? offset ?";
 	}
 }

+ 1 - 1
magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/MySQLDialect.java

@@ -19,6 +19,6 @@ public class MySQLDialect implements Dialect {
 	public String getPageSql(String sql, BoundSql boundSql, long offset, long limit) {
 		boundSql.addParameter(offset);
 		boundSql.addParameter(limit);
-		return sql + " limit ?,?";
+		return sql + "\n limit ?,?";
 	}
 }

+ 2 - 2
magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/OracleDialect.java

@@ -20,7 +20,7 @@ public class OracleDialect implements Dialect {
 		limit = (offset >= 1) ? (offset + limit) : limit;
 		boundSql.addParameter(limit);
 		boundSql.addParameter(offset);
-		return "SELECT * FROM ( SELECT TMP.*, ROWNUM ROW_ID FROM ( " +
-				sql + " ) TMP WHERE ROWNUM <= ? ) WHERE ROW_ID > ?";
+		return "SELECT * FROM ( SELECT TMP.*, ROWNUM ROW_ID FROM ( \n" +
+				sql + "\n ) TMP WHERE ROWNUM <= ? ) WHERE ROW_ID > ?";
 	}
 }

+ 1 - 1
magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/PostgreSQLDialect.java

@@ -18,6 +18,6 @@ public class PostgreSQLDialect implements Dialect {
 	public String getPageSql(String sql, BoundSql boundSql, long offset, long limit) {
 		boundSql.addParameter(limit);
 		boundSql.addParameter(offset);
-		return sql + " limit ? offset ?";
+		return sql + "\n limit ? offset ?";
 	}
 }

+ 1 - 1
magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/SQLServerDialect.java

@@ -18,6 +18,6 @@ public class SQLServerDialect implements Dialect {
 	public String getPageSql(String sql, BoundSql boundSql, long offset, long limit) {
 		boundSql.addParameter(offset);
 		boundSql.addParameter(limit);
-		return sql + " OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+		return sql + "\n OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
 	}
 }