From 5a3791b530c565869ee76ffda06701eae4fe1c95 Mon Sep 17 00:00:00 2001 From: wangyao Date: Mon, 1 Aug 2022 17:15:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E6=B3=A8=E9=87=8A=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/ssssssss/magicapi/modules/db/dialect/DB2Dialect.java | 4 ++-- .../org/ssssssss/magicapi/modules/db/dialect/Dialect.java | 2 +- .../org/ssssssss/magicapi/modules/db/dialect/DmDialect.java | 4 ++-- .../magicapi/modules/db/dialect/KingbaseSQLDialect.java | 2 +- .../ssssssss/magicapi/modules/db/dialect/MySQLDialect.java | 2 +- .../ssssssss/magicapi/modules/db/dialect/OracleDialect.java | 4 ++-- .../magicapi/modules/db/dialect/PostgreSQLDialect.java | 2 +- .../magicapi/modules/db/dialect/SQLServerDialect.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) 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 65493d39..2c064028 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 2638a7b5..3bfb565c 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 483350d1..2c8505e2 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 81da0872..927fb69d 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 292b6009..8b0fb722 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 4bc664aa..968dc22c 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 6538f8d7..19550fcd 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 6a44e9c0..6e0cfac8 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"; } } -- Gitee