From 806f5bef06dfbd19bae75465546956eb6b3e8e33 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Mon, 14 Aug 2023 11:32:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=B8=8A=E4=B8=80=E4=B8=AA=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=8C=87=E5=90=91=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mybatisflex/core/query/Brackets.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java index 9617f4b9..c89a8dbf 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java @@ -80,7 +80,7 @@ public class Brackets extends QueryCondition { @Override protected QueryCondition getPrevEffectiveCondition() { - return childCondition.getPrevEffectiveCondition(); + return super.getPrevEffectiveCondition(); } @Override From d44d2c8225a2aa68f31389f9e73213a8fc3c3962 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Mon, 14 Aug 2023 11:33:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?test:=20=E6=9D=A1=E4=BB=B6=E5=B5=8C?= =?UTF-8?q?=E5=A5=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mybatisflex/coretest/DynamicConditionTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java index 590965ec..6576e8a7 100644 --- a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java +++ b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java @@ -131,4 +131,14 @@ public class DynamicConditionTest { System.out.println(queryWrapper.toSQL()); } + @Test + public void test08() { + QueryWrapper queryWrapper = QueryWrapper.create(). + from(ACCOUNT) + .where(ACCOUNT.ID.eq(1)) + .and(ACCOUNT.AGE.in(17, 18, 19).or(ACCOUNT.USER_NAME.eq("zhang san"))); + + System.out.println(queryWrapper.toSQL()); + } + } From 16b009515794f5796aa05c822d80bbfb399920d3 Mon Sep 17 00:00:00 2001 From: Suomm <1474983351@qq.com> Date: Mon, 14 Aug 2023 12:21:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?test:=20=E6=B5=8B=E8=AF=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=88=97=E8=8E=B7=E5=8F=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mybatisflex/core/query/Brackets.java | 5 ----- .../mybatisflex/coretest/DynamicConditionTest.java | 11 +++++++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java index c89a8dbf..2525571f 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java @@ -78,11 +78,6 @@ public class Brackets extends QueryCondition { return childCondition.when(fn); } - @Override - protected QueryCondition getPrevEffectiveCondition() { - return super.getPrevEffectiveCondition(); - } - @Override protected QueryCondition getNextEffectiveCondition() { return childCondition.getNextEffectiveCondition(); diff --git a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java index 6576e8a7..0d18aa94 100644 --- a/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java +++ b/mybatis-flex-core/src/test/java/com/mybatisflex/coretest/DynamicConditionTest.java @@ -135,8 +135,15 @@ public class DynamicConditionTest { public void test08() { QueryWrapper queryWrapper = QueryWrapper.create(). from(ACCOUNT) - .where(ACCOUNT.ID.eq(1)) - .and(ACCOUNT.AGE.in(17, 18, 19).or(ACCOUNT.USER_NAME.eq("zhang san"))); + .where(ACCOUNT.ID.eq(1) + .and(ACCOUNT.AGE.in(17, 18, 19).or(ACCOUNT.USER_NAME.eq("zhang san")) + )); + + QueryCondition condition = CPI.getWhereQueryCondition(queryWrapper); + while (condition != null) { + System.out.println(condition.getColumn().getName()); + condition = CPI.getNextCondition(condition); + } System.out.println(queryWrapper.toSQL()); }