From 0c51d655f3ca38bce0a5b5280da17328786f0bc9 Mon Sep 17 00:00:00 2001 From: black Date: Fri, 17 Mar 2023 10:14:06 +0800 Subject: [PATCH] fix: count with group (#6157) --- finisher_api.go | 2 +- tests/count_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/finisher_api.go b/finisher_api.go index e6fe4666..a9ca74ca 100644 --- a/finisher_api.go +++ b/finisher_api.go @@ -491,7 +491,7 @@ func (db *DB) Count(count *int64) (tx *DB) { tx.Statement.Dest = count tx = tx.callbacks.Query().Execute(tx) - if tx.RowsAffected != 1 { + if _, ok := db.Statement.Clauses["GROUP BY"]; ok || tx.RowsAffected != 1 { *count = tx.RowsAffected } diff --git a/tests/count_test.go b/tests/count_test.go index 2199dc6d..0a24cf86 100644 --- a/tests/count_test.go +++ b/tests/count_test.go @@ -141,8 +141,8 @@ func TestCount(t *testing.T) { } DB.Create(sameUsers) - if err := DB.Model(&User{}).Where("name = ?", "count-4").Group("name").Count(&count11).Error; err != nil || count11 != int64(len(sameUsers)) { - t.Fatalf("Count should be 3, but got count: %v err %v", count11, err) + if err := DB.Model(&User{}).Where("name = ?", "count-4").Group("name").Count(&count11).Error; err != nil || count11 != 1 { + t.Fatalf("Count should be 1, but got count: %v err %v", count11, err) } var count12 int64