From 589e63ada97a27ef4829da3012e261f4c6099c78 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Sun, 15 Jan 2023 16:50:42 +0800 Subject: [PATCH] log4j-slf4j-impl --- .../main/java/org/apache/mybatis/jpa/dialect/DB2Dialect.java | 2 ++ .../org/apache/mybatis/jpa/dialect/PostgreSQLDialect.java | 4 ++-- pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/dialect/DB2Dialect.java b/mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/dialect/DB2Dialect.java index dc6b422..c1b2e4c 100644 --- a/mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/dialect/DB2Dialect.java +++ b/mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/dialect/DB2Dialect.java @@ -40,6 +40,7 @@ public class DB2Dialect extends Dialect { if ( pagination.getPageSize() == 0 ) { return sql + " fetch first " + pagination.getStartRow() + " rows only"; } + StringBuilder pagingSelectSql = new StringBuilder( sql.length() + 200 ) .append( "select * from ( select inner2_.*, rownumber() over(order by order of inner2_) as rownumber_ from ( " @@ -50,6 +51,7 @@ public class DB2Dialect extends Dialect { .append(" rows only ) as inner2_ ) as inner1_ where rownumber_ > " ) .append(pagination.getStartRow()) .append(" order by rownumber_"); + return pagingSelectSql.toString(); } diff --git a/mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/dialect/PostgreSQLDialect.java b/mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/dialect/PostgreSQLDialect.java index 1a018c6..ac5e50f 100644 --- a/mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/dialect/PostgreSQLDialect.java +++ b/mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/dialect/PostgreSQLDialect.java @@ -38,8 +38,8 @@ public class PostgreSQLDialect extends Dialect { public String getLimitString(String sql, JpaPagination pagination) { //LIMIT #{pageResults} OFFSET #{startRow} if(pagination.getPageSize()>0&&pagination.getStartRow()>0){ - return sql + " limit " + pagination.getPageSize()+" offset "+pagination.getStartRow() ; - }else if(pagination.getPageSize()>0){ + return sql + " limit " + pagination.getPageSize() +" offset " + pagination.getStartRow() ; + }else if(pagination.getPageSize() > 0){ return sql + " limit " + pagination.getPageSize(); }else{ return sql + " limit 1000"; diff --git a/pom.xml b/pom.xml index 61d9524..b0b2e37 100644 --- a/pom.xml +++ b/pom.xml @@ -246,13 +246,13 @@ log4j-jul ${log4j.version} - org.apache.logging.log4j log4j-slf4j-impl ${log4j.version} - --> + org.slf4j -- GitLab