From d82536b5cdf56d53cc820ad758153254ee571e93 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: Wed, 19 Apr 2023 17:05:53 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=20=E4=BD=BF=E7=94=A8QueryMethods.count()?=
 =?UTF-8?q?=E6=97=B6=E5=87=BA=E9=94=99=20close=20#I6X2M6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatisflex/core/query/QueryMethods.java  |  2 +-
 .../java/com/mybatisflex/test/Account.java    | 45 -------------------
 .../com/mybatisflex/test/BaseAccount.java     | 11 -----
 .../mybatisflex/test/EntityTestStarter.java   |  9 ++++
 4 files changed, 10 insertions(+), 57 deletions(-)

diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryMethods.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryMethods.java
index a8d7a529..6fc8bc7e 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryMethods.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryMethods.java
@@ -18,7 +18,7 @@ package com.mybatisflex.core.query;
 public class QueryMethods {
 
     public static FunctionQueryColumn count() {
-        return new FunctionQueryColumn("COUNT", "*");
+        return new FunctionQueryColumn("COUNT", new StringQueryColumn("*"));
     }
 
     public static FunctionQueryColumn count(String column) {
diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java
index fa0fc21f..6ad76b9e 100644
--- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/Account.java
@@ -22,22 +22,12 @@ public class Account extends BaseAccount implements Serializable {
 
     private int age;
 
-    private SexEnum sex;
-
     private Date birthday;
 
-    @Column("DEPT_ID_")
-    private String deptId;
-
     @Column(typeHandler = Fastjson2TypeHandler.class,isLarge = true)
     private Map<String, Object> options;
 
 
-    private TypeEnum typeEnum;
-
-//    @Column(isLogicDelete = true)
-//    private boolean deleteFlag;
-
 
     public Long getId() {
         return id;
@@ -63,14 +53,6 @@ public class Account extends BaseAccount implements Serializable {
         this.age = age;
     }
 
-    public SexEnum getSex() {
-        return sex;
-    }
-
-    public void setSex(SexEnum sex) {
-        this.sex = sex;
-    }
-
     public Date getBirthday() {
         return birthday;
     }
@@ -94,30 +76,6 @@ public class Account extends BaseAccount implements Serializable {
         options.put(key, value);
     }
 
-    public String getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(String deptId) {
-        this.deptId = deptId;
-    }
-
-    public TypeEnum getTypeEnum() {
-        return typeEnum;
-    }
-
-    public void setTypeEnum(TypeEnum typeEnum) {
-        this.typeEnum = typeEnum;
-    }
-
-//    public boolean isDeleteFlag() {
-//        return deleteFlag;
-//    }
-//
-//    public void setDeleteFlag(boolean deleteFlag) {
-//        this.deleteFlag = deleteFlag;
-//    }
-
 
     @Override
     public String toString() {
@@ -125,11 +83,8 @@ public class Account extends BaseAccount implements Serializable {
                 "id=" + id +
                 ", userName='" + userName + '\'' +
                 ", age=" + age +
-                ", sex=" + sex +
                 ", birthday=" + birthday +
-                ", deptId='" + deptId + '\'' +
                 ", options=" + options +
-                ", typeEnum=" + typeEnum +
                 '}';
     }
 }
diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/BaseAccount.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/BaseAccount.java
index ae28e779..227a286a 100644
--- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/BaseAccount.java
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/BaseAccount.java
@@ -1,16 +1,5 @@
 package com.mybatisflex.test;
 
-import java.util.Date;
-
 public class BaseAccount {
 
-    private Date createTime;
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 }
diff --git a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/EntityTestStarter.java b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/EntityTestStarter.java
index b82cf587..d743fa20 100644
--- a/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/EntityTestStarter.java
+++ b/mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/EntityTestStarter.java
@@ -26,6 +26,11 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
 import javax.sql.DataSource;
 
+import java.util.List;
+
+import static com.mybatisflex.core.query.QueryMethods.count;
+import static com.mybatisflex.test.table.Tables.ACCOUNT;
+
 public class EntityTestStarter {
 
     public static void main(String[] args) {
@@ -50,6 +55,10 @@ public class EntityTestStarter {
 
         AccountMapper accountMapper = bootstrap.getMapper(AccountMapper.class);
 
+        QueryWrapper wrapper = QueryWrapper.create().select(ACCOUNT.DEFAULT_COLUMNS).select(count()).from(ACCOUNT)
+                .groupBy(ACCOUNT.ID);
+        List<Account> accounts = accountMapper.selectListByQuery(wrapper);
+
 
         Page<Account> paginate = accountMapper.paginate(new Page<>(1,10), new QueryWrapper());
         System.out.println(paginate);