From 8b9585ba3c5b81a74c51b068aa2fb02bb3f0e8fe Mon Sep 17 00:00:00 2001 From: F3235157 Date: Mon, 20 Jan 2025 17:34:01 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20https://gitee.com/mybatis-flex/mybatis-fl?= =?UTF-8?q?ex/issues/IBIJT3=20[Bug]:=20SqlServer2005=E6=96=B9=E8=A8=80List?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2SQL=E8=AF=AD=E5=8F=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/dialect/LimitOffsetProcessor.java | 18 +++-- .../coretest/SqlServer2005DialectTester.java | 66 +++++++------------ 2 files changed, 35 insertions(+), 49 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/LimitOffsetProcessor.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/LimitOffsetProcessor.java index d3835e5d..fbdbad61 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/LimitOffsetProcessor.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/LimitOffsetProcessor.java @@ -129,13 +129,19 @@ public interface LimitOffsetProcessor { originalSQL = originalSQL.substring(0, sql.lastIndexOf(ORDER_BY)); orderByString = orderBySql.toString(); } + //Fix https://gitee.com/mybatis-flex/mybatis-flex/issues/IBIJT3 [Bug]: SqlServer2005方言List查询SQL语句BUG + String columeSQL = originalSQL.substring(0, sql.indexOf(FROM)); + String contitionSQL = originalSQL.substring(sql.indexOf(FROM)); StringBuilder newSql = new StringBuilder(); //fix SqlServer 多表关联查询，主表去重，执行SQL异常 https://gitee.com/mybatis-flex/mybatis-flex/issues/IABEJG - newSql.append("WITH temp_datas AS(SELECT __Tab.*, ROW_NUMBER() OVER ( ").append(orderByString) - .append(") as __rn ").append(" FROM ( ").append(originalSQL).append(" ) as __Tab ) "); - newSql.append(" SELECT * FROM temp_datas WHERE __rn BETWEEN ") - .append(limitOffset + 1).append(" AND ").append(limitOffset + limitRows); + newSql.append("WITH temp_datas AS(").append(columeSQL).append(", ROW_NUMBER() OVER (") + .append(orderByString) + .append(") as __rn "); + newSql.append(contitionSQL); + newSql.append(")"); + newSql.append(" SELECT * FROM temp_datas WHERE __rn BETWEEN ").append(limitOffset + 1).append(" AND ") + .append(limitOffset + limitRows); newSql.append(" ORDER BY __rn"); return newSql; } @@ -193,9 +199,7 @@ public interface LimitOffsetProcessor { } StringBuilder newSql = new StringBuilder("SELECT * FROM (SELECT TEMP_DATAS.*, ROWNUM RN FROM ("); newSql.append(sql); - newSql.append(") TEMP_DATAS WHERE ROWNUM <= ") - .append(limitOffset + limitRows) - .append(") WHERE RN > ") + newSql.append(") TEMP_DATAS WHERE ROWNUM <= ").append(limitOffset + limitRows).append(") WHERE RN > ") .append(limitOffset); return newSql; } diff --git a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/SqlServer2005DialectTester.java b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/SqlServer2005DialectTester.java index 9e154087..7766144d 100644 --- a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/SqlServer2005DialectTester.java +++ b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/SqlServer2005DialectTester.java @@ -16,6 +16,9 @@ package com.mybatisflex.coretest; +import static com.mybatisflex.coretest.table.AccountTableDef.ACCOUNT; +import static com.mybatisflex.coretest.table.ArticleTableDef.ARTICLE; + import com.mybatisflex.core.dialect.IDialect; import com.mybatisflex.core.dialect.KeywordWrap; import com.mybatisflex.core.dialect.LimitOffsetProcessor; @@ -26,78 +29,62 @@ import com.mybatisflex.core.query.QueryWrapper; import org.junit.Assert; import org.junit.Test; -import static com.mybatisflex.coretest.table.AccountTableDef.ACCOUNT; - public class SqlServer2005DialectTester { @Test public void testSelectSql() { - QueryWrapper query = new QueryWrapper() - .select() - .from(ACCOUNT) - .where(ACCOUNT.ID.in("100", "200")) - .and(ACCOUNT.SEX.eq(1)) - .orderBy(ACCOUNT.ID.desc()) - .limit(10, 10); + QueryWrapper query = new QueryWrapper().select().from(ACCOUNT).where(ACCOUNT.ID.in("100", "200")) + .and(ACCOUNT.SEX.eq(1)).orderBy(ACCOUNT.ID.desc()).limit(10, 10); IDialect dialect = new CommonsDialectImpl(KeywordWrap.SQUARE_BRACKETS, LimitOffsetProcessor.SQLSERVER_2005); String sql = dialect.forSelectByQuery(query); System.out.println(sql); Assert.assertEquals("WITH temp_datas AS(" - + "SELECT ROW_NUMBER() OVER ( ORDER BY [id] DESC) as __rn, * FROM [tb_account] WHERE [id] IN (?, ?) AND [sex] = ?" - + - ") " + - "SELECT * FROM temp_datas WHERE __rn BETWEEN 11 AND 20 ORDER BY __rn", sql); + + "SELECT *, ROW_NUMBER() OVER ( ORDER BY [id] DESC) as __rn FROM [tb_account] WHERE [id] IN (?, ?) AND [sex] = ?" + + ") " + "SELECT * FROM temp_datas WHERE __rn BETWEEN 11 AND 20 ORDER BY __rn", sql); } @Test public void testSelectSqlSqlserver2005() { - QueryWrapper query = new QueryWrapper().select() - .from("TEST.dbo.tb_account") - .where(ACCOUNT.ID.in("100", "200")) - .and(ACCOUNT.SEX.eq(1)) - .orderBy(ACCOUNT.ID.desc()) - .limit(0, 10); - + QueryWrapper query = new QueryWrapper().select(ACCOUNT.ID.as("ID"), ACCOUNT.AGE.as("AGE"), ARTICLE.ID) + .from(ACCOUNT.as("account")) + .innerJoin(ARTICLE).on(ARTICLE.ACCOUNT_ID.eq(ACCOUNT.ID)) + .where(ACCOUNT.ID.in("100", "200")).and(ACCOUNT.SEX.eq(1)) + .orderBy(ACCOUNT.ID.as("ID").desc(), ACCOUNT.AGE.asc(), ARTICLE.ID.desc()).limit(10); IDialect dialect = new Sqlserver2005DialectImpl(KeywordWrap.SQUARE_BRACKETS, LimitOffsetProcessor.SQLSERVER_2005); String sql = dialect.forSelectByQuery(query); System.out.println(sql); Assert.assertEquals( - "WITH temp_datas AS(SELECT ROW_NUMBER() OVER ( ORDER BY [tb_account].[id] DESC) as __rn, * FROM [TEST].[dbo].[tb_account] WHERE [tb_account].[id] IN (?, ?) AND [tb_account].[sex] = ?) SELECT * FROM temp_datas WHERE __rn BETWEEN 1 AND 10 ORDER BY __rn", + "WITH temp_datas AS(SELECT [account].[id] AS [ID], [account].[age] AS [AGE], [tb_article].[id], ROW_NUMBER() OVER ( ORDER BY [account].[id] DESC, [account].[age] ASC, [tb_article].[id] DESC) as __rn FROM [tb_account] AS [account] INNER JOIN [tb_article] ON [tb_article].[account_id] = [account].[id] WHERE [account].[id] IN (?, ?) AND [account].[sex] = ?) SELECT * FROM temp_datas WHERE __rn BETWEEN 1 AND 10 ORDER BY __rn", sql); } @Test public void testSelectSqlSqlserver2005With() { - QueryWrapper query = new QueryWrapper().select(ACCOUNT.ID.as("user_id"), ACCOUNT.AGE) + QueryWrapper query = new QueryWrapper() + .select(ACCOUNT.ID.as("user_id"), ACCOUNT.AGE) .from("TEST.dbo.tb_account") - .where(ACCOUNT.ID.in("100", "200")) + .innerJoin(ARTICLE).on(ARTICLE.ACCOUNT_ID.eq(ACCOUNT.ID)).where(ACCOUNT.ID.in("100", "200")) .and(ACCOUNT.SEX.eq(1)) - .orderBy(ACCOUNT.ID.desc()) - .limit(0, 10); + .orderBy(ACCOUNT.ID.desc()).limit(0, 10); IDialect dialect = new Sqlserver2005DialectImpl(KeywordWrap.SQUARE_BRACKETS, LimitOffsetProcessor.SQLSERVER_2005); String sql = dialect.forSelectByQuery(query); System.out.println(sql); Assert.assertEquals( - "WITH temp_datas AS(SELECT ROW_NUMBER() OVER ( ORDER BY [tb_account].[id] DESC) as __rn, [tb_account].[id] AS [user_id], [tb_account].[age] FROM [TEST].[dbo].[tb_account] WHERE [tb_account].[id] IN (?, ?) AND [tb_account].[sex] = ?) SELECT user_id, age FROM temp_datas WHERE __rn BETWEEN 1 AND 10 ORDER BY __rn", + "WITH temp_datas AS(SELECT [tb_account].[id] AS [user_id], [tb_account].[age], ROW_NUMBER() OVER ( ORDER BY [tb_account].[id] DESC) as __rn FROM [TEST].[dbo].[tb_account] INNER JOIN [tb_article] ON [tb_article].[account_id] = [tb_account].[id] WHERE [tb_account].[id] IN (?, ?) AND [tb_account].[sex] = ?) SELECT * FROM temp_datas WHERE __rn BETWEEN 1 AND 10 ORDER BY __rn", sql); } @Test public void testSelectSqlSqlserver() { - QueryWrapper query = new QueryWrapper().select() - .from("TEST.dbo.tb_account") - .where(ACCOUNT.ID.in("100", "200")) - .and(ACCOUNT.SEX.eq(1)) - .orderBy(ACCOUNT.ID.desc()) - .limit(0, 10); + QueryWrapper query = new QueryWrapper().select().from("TEST.dbo.tb_account").where(ACCOUNT.ID.in("100", "200")) + .and(ACCOUNT.SEX.eq(1)).orderBy(ACCOUNT.ID.desc()).limit(0, 10); - IDialect dialect = new SqlserverDialectImpl(KeywordWrap.SQUARE_BRACKETS, - LimitOffsetProcessor.SQLSERVER); + IDialect dialect = new SqlserverDialectImpl(KeywordWrap.SQUARE_BRACKETS, LimitOffsetProcessor.SQLSERVER); String sql = dialect.forSelectByQuery(query); System.out.println(sql); Assert.assertEquals( @@ -107,15 +94,10 @@ public class SqlServer2005DialectTester { @Test public void testSelectSqlSqlserver1() { - QueryWrapper query = new QueryWrapper().select() - .from("tb_account") - .where(ACCOUNT.ID.in("100", "200")) - .and(ACCOUNT.SEX.eq(1)) - .orderBy(ACCOUNT.ID.desc()) - .limit(0, 10); + QueryWrapper query = new QueryWrapper().select().from("tb_account").where(ACCOUNT.ID.in("100", "200")) + .and(ACCOUNT.SEX.eq(1)).orderBy(ACCOUNT.ID.desc()).limit(0, 10); - IDialect dialect = new SqlserverDialectImpl(KeywordWrap.SQUARE_BRACKETS, - LimitOffsetProcessor.SQLSERVER); + IDialect dialect = new SqlserverDialectImpl(KeywordWrap.SQUARE_BRACKETS, LimitOffsetProcessor.SQLSERVER); String sql = dialect.forSelectByQuery(query); System.out.println(sql); Assert.assertEquals(