diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/DB2Dialect.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/DB2Dialect.java index 65493d3954607b196a17ba5824d2177194fdb401..2c064028d922b53d49900c3a9e7e499e562cf5b4 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/DB2Dialect.java +++ b/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 ?"; } } diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/Dialect.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/Dialect.java index 2638a7b55f07356710acb2a53af44ae536e70d04..3bfb565c0c61962484061b7e0522eaecf442fd39 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/Dialect.java +++ b/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_"; } /** diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/DmDialect.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/DmDialect.java index 483350d14e86f4f740ef088b48e2d18051c3e26a..2c8505e284e796bb6bf16963835376e9c6251f4c 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/DmDialect.java +++ b/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 > ?"; } } diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/KingbaseSQLDialect.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/KingbaseSQLDialect.java index 81da0872b5c775c12d0307ef19db894e9ef1a08b..927fb69d1472011033b4373d88295e260e6e736b 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/KingbaseSQLDialect.java +++ b/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 ?"; } } diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/MySQLDialect.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/MySQLDialect.java index 292b6009866e0eaed9a7e886b03300131694a1d7..8b0fb72285453cd851219d3661b60e6abde0810b 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/MySQLDialect.java +++ b/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 ?,?"; } } diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/OracleDialect.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/OracleDialect.java index 4bc664aac7d0fab126f2eece93fff1f3c849042d..968dc22cfedb9f97b867129fb8fcb933482c65ed 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/OracleDialect.java +++ b/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 > ?"; } } diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/PostgreSQLDialect.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/PostgreSQLDialect.java index 6538f8d7b1e7b5637d098e80e8f96b4f1eb5cf4a..19550fcd50e88420c760fca823d959801d13a76e 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/PostgreSQLDialect.java +++ b/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 ?"; } } diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/SQLServerDialect.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/SQLServerDialect.java index 6a44e9c0f588236f8237e74aced02f954815f8c4..6e0cfac8167804c64e5689dac8a504df249da3b7 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/db/dialect/SQLServerDialect.java +++ b/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"; } }