From b5b8e8172b365b03e8a8e2f2003243de6d1f5e4c Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Thu, 8 Jun 2023 15:10:22 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"test:=20=E6=B5=8B=E8=AF=95=20field=20?=
 =?UTF-8?q?query"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 34831a020cb1f276499b2bec258cf1167fe4bfc4.
---
 .../com/mybatisflex/test/model/UserVO.java    |  5 ++-
 .../test/mapper/UserMapperTest.java           | 31 +++----------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/model/UserVO.java b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/model/UserVO.java
index e87758f0..e3f8cf59 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/model/UserVO.java
+++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/model/UserVO.java
@@ -16,7 +16,6 @@
 
 package com.mybatisflex.test.model;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,7 +29,7 @@ public class UserVO {
 
     private String userId;
     private String userName;
-    private ArrayList<Role> roleList;
+    private List<Role> roleList;
 
     public String getUserId() {
         return userId;
@@ -52,7 +51,7 @@ public class UserVO {
         return roleList;
     }
 
-    public void setRoleList(ArrayList<Role> roleList) {
+    public void setRoleList(List<Role> roleList) {
         this.roleList = roleList;
     }
 
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/UserMapperTest.java b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/UserMapperTest.java
index cdf8047d..6b936daa 100644
--- a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/UserMapperTest.java
+++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/test/java/com/mybatisflex/test/mapper/UserMapperTest.java
@@ -25,7 +25,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.List;
 
-import static com.mybatisflex.core.query.QueryMethods.select;
 import static com.mybatisflex.test.model.table.GoodTableDef.GOOD;
 import static com.mybatisflex.test.model.table.OrderGoodTableDef.ORDER_GOOD;
 import static com.mybatisflex.test.model.table.OrderTableDef.ORDER;
@@ -60,31 +59,6 @@ class UserMapperTest {
         System.err.println(userVO);
     }
 
-    @Test
-    void testFieldQuery() {
-        QueryWrapper queryWrapper = QueryWrapper.create()
-                .select(USER.USER_ID, USER.USER_NAME)
-                .from(USER.as("u"))
-                .where(USER.USER_ID.eq(3));
-        System.out.println(queryWrapper.toSQL());
-        List<UserVO> userVOs = userMapper.selectListByQueryAs(queryWrapper, UserVO.class,
-                fieldQueryBuilder -> fieldQueryBuilder
-                        .field(UserVO::getRoleList)
-                        .queryWrapper(user -> QueryWrapper.create()
-                                .select()
-                                .from(ROLE)
-                                .where(ROLE.ROLE_ID.in(
-                                        select(USER_ROLE.ROLE_ID)
-                                                .from(USER_ROLE)
-                                                .where(USER_ROLE.USER_ID.eq(user.getUserId())
-                                               )
-                                )
-                        )
-                )
-        );
-        System.err.println(userVOs);
-    }
-
     @Test
     void testSelectList() {
         QueryWrapper queryWrapper = QueryWrapper.create()
@@ -92,9 +66,12 @@ class UserMapperTest {
                 .from(USER.as("u"))
                 .leftJoin(USER_ROLE).as("ur").on(USER_ROLE.USER_ID.eq(USER.USER_ID))
                 .leftJoin(ROLE).as("r").on(USER_ROLE.ROLE_ID.eq(ROLE.ROLE_ID))
-                .where(USER.USER_ID.eq(3));
+                .where(USER.USER_ID.ge(2));
         System.out.println(queryWrapper.toSQL());
         List<UserVO> userVOS = userMapper.selectListByQueryAs(queryWrapper, UserVO.class);
+//        List<UserVO1> userVOS = userMapper.selectListByQueryAs(queryWrapper, UserVO1.class);
+//        List<UserVO2> userVOS = userMapper.selectListByQueryAs(queryWrapper, UserVO2.class);
+//        List<UserVO3> userVOS = userMapper.selectListByQueryAs(queryWrapper, UserVO3.class);
         userVOS.forEach(System.err::println);
     }