From fa256234d1a4c952c56b2586564e492bafc3a877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=80=E6=BA=90=E6=B5=B7=E5=93=A5?= <fuhai999@gmail.com>
Date: Tue, 17 Oct 2023 10:42:39 +0800
Subject: [PATCH] =?UTF-8?q?test:=20=E4=B8=BA=E6=B5=8B=E8=AF=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9B=B4=E5=A4=9A=E7=9A=84=E6=96=AD=E8=A8=80=E5=B7=B2?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81=E6=B5=8B=E8=AF=95=E5=AE=89=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mybatis-flex-spring-boot-starter/pom.xml      |  2 +-
 mybatis-flex-spring/pom.xml                   |  8 ++++-
 .../test/common/QueryWrapperTest.java         | 31 +++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml
index be0a88fc..2ea59713 100644
--- a/mybatis-flex-spring-boot-starter/pom.xml
+++ b/mybatis-flex-spring-boot-starter/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-spring</artifactId>
-            <version>${mybatis-flex.version}</version>
+            <version>1.7.1</version>
         </dependency>
 
         <dependency>
diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml
index f2571619..069a212e 100644
--- a/mybatis-flex-spring/pom.xml
+++ b/mybatis-flex-spring/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.mybatis-flex</groupId>
             <artifactId>mybatis-flex-core</artifactId>
-            <version>${mybatis-flex.version}</version>
+            <version>1.7.1</version>
         </dependency>
 
         <dependency>
@@ -39,6 +39,12 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.mybatis-flex</groupId>
+            <artifactId>mybatis-flex-annotation</artifactId>
+            <version>1.7.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/common/QueryWrapperTest.java b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/common/QueryWrapperTest.java
index 37f83691..6e07d83b 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/common/QueryWrapperTest.java
+++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/common/QueryWrapperTest.java
@@ -50,6 +50,20 @@ class QueryWrapperTest {
             .groupBy(ROLE.ROLE_KEY)
             .having(ROLE.ROLE_ID.eq(USER_ROLE.ROLE_ID))
             .orderBy(ROLE.ROLE_NAME.asc());
+
+        Assertions.assertEquals("SELECT /*+ hint */ `u`.`user_id`, `r`.* " +
+                "FROM `tb_user` AS `u` " +
+                "LEFT JOIN `tb_user_role` AS `ur` ON `u`.`user_id` = `ur`.`user_id` " +
+                "LEFT JOIN `tb_role` AS `r` ON `r`.`role_id` = `ur`.`role_id` " +
+                "WHERE `u`.`user_id` = 3 AND `u`.`user_id` = `r`.`role_id` OR `u`.`user_id` IN (4, 5, 6) " +
+                "GROUP BY `r`.`role_key` " +
+                "HAVING `r`.`role_id` = `ur`.`role_id` " +
+                "ORDER BY `r`.`role_name` ASC"
+            ,queryWrapper.toSQL());
+
+        System.out.println(queryWrapper.toSQL());
+
+
         System.out.println(queryWrapper.toSQL());
     }
 
@@ -72,6 +86,19 @@ class QueryWrapperTest {
             .groupBy(ROLE.ROLE_NAME)
             .having(ROLE.ROLE_ID.ge(7))
             .orderBy(ROLE.ROLE_NAME.asc());
+
+        Assertions.assertEquals("SELECT COUNT(DISTINCT `u`.`user_id`), " +
+                "CASE WHEN `u`.`user_id` = 3 THEN 'x3' WHEN `u`.`user_id` = 5 " +
+                "THEN 'x4' END, DISTINCT `u`.`user_id` + 4, `u`.`user_name`, `r`.* " +
+                "FROM `tb_user` AS `u` " +
+                "LEFT JOIN `tb_user_role` AS `ur` ON `ur`.`user_id` = `u`.`user_id` " +
+                "LEFT JOIN `tb_role` AS `r` ON `ur`.`role_id` = `r`.`role_id` " +
+                "WHERE `u`.`user_id` = 3 AND `r`.`role_name` IN (1, 2, 3) OR `r`.`role_id` >= `u`.`user_id` " +
+                "GROUP BY `r`.`role_name` " +
+                "HAVING `r`.`role_id` >= 7 " +
+                "ORDER BY `r`.`role_name` ASC"
+            ,queryWrapper.toSQL());
+
         System.out.println(queryWrapper.toSQL());
     }
 
@@ -89,6 +116,7 @@ class QueryWrapperTest {
         System.out.println(queryWrapper.toSQL());
         QueryCondition whereQueryCondition = CPI.getWhereQueryCondition(queryWrapper);
         boolean contained = CPI.containsTable(whereQueryCondition, "tb_user_role");
+
         Assertions.assertTrue(contained);
     }
 
@@ -98,6 +126,9 @@ class QueryWrapperTest {
             .select("a.*")
             .from(new RawQueryTable("(select * from app) as a"));
 
+        Assertions.assertEquals("SELECT a.* FROM (select * from app) as a"
+            ,queryWrapper.toSQL());
+
         System.out.println(queryWrapper.toSQL());
     }