re
/
gorm
forked from mirror/gorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix count with selected *

This commit is contained in:
Jinzhu 2021-09-16 11:17:54 +08:00
parent d41fb3acdc
commit 61b018cb94
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
finisher_api.go
View File

@ -399,7 +399,7 @@ func (db *DB) Count(count *int64) (tx *DB) {
if tx.Statement.Distinct { if tx.Statement.Distinct {
expr = clause.Expr{SQL: "COUNT(DISTINCT(?))", Vars: []interface{}{clause.Column{Name: dbName}}} expr = clause.Expr{SQL: "COUNT(DISTINCT(?))", Vars: []interface{}{clause.Column{Name: dbName}}}
} else { } else if dbName != "*" {
expr = clause.Expr{SQL: "COUNT(?)", Vars: []interface{}{clause.Column{Name: dbName}}} expr = clause.Expr{SQL: "COUNT(?)", Vars: []interface{}{clause.Column{Name: dbName}}}
} }
} }

12
tests/count_test.go
View File

@ -112,7 +112,7 @@ func TestCount(t *testing.T) {
if err := DB.Model(&User{}).Where("name in ?", []string{user1.Name, user2.Name, user3.Name}).Select( if err := DB.Model(&User{}).Where("name in ?", []string{user1.Name, user2.Name, user3.Name}).Select(
"(CASE WHEN age=18 THEN 1 ELSE 2 END) as age", "name", "(CASE WHEN age=18 THEN 1 ELSE 2 END) as age", "name",
).Count(&count8).Find(&users).Error; err != nil || count8 != 3 { ).Count(&count8).Find(&users).Error; err != nil || count8 != 3 {
t.Fatalf(fmt.Sprintf("Count should work, but got err %v", err)) t.Fatalf("Count should work, but got err %v", err)
} }
expects = []User{User{Name: "count-1", Age: 1}, {Name: "count-2", Age: 1}, {Name: "count-3", Age: 1}} expects = []User{User{Name: "count-1", Age: 1}, {Name: "count-2", Age: 1}, {Name: "count-3", Age: 1}}
@ -123,9 +123,15 @@ func TestCount(t *testing.T) {
AssertEqual(t, users, expects) AssertEqual(t, users, expects)
var count9 int64 var count9 int64
if err := DB.Debug().Scopes(func(tx *gorm.DB) *gorm.DB { if err := DB.Scopes(func(tx *gorm.DB) *gorm.DB {
return tx.Table("users") return tx.Table("users")
}).Where("name in ?", []string{user1.Name, user2.Name, user3.Name}).Count(&count9).Find(&users).Error; err != nil || count9 != 3 { }).Where("name in ?", []string{user1.Name, user2.Name, user3.Name}).Count(&count9).Find(&users).Error; err != nil || count9 != 3 {
t.Fatalf(fmt.Sprintf("Count should work, but got err %v", err)) t.Fatalf("Count should work, but got err %v", err)
} }
var count10 int64
if err := DB.Model(&User{}).Select("*").Where("name in ?", []string{user1.Name, user2.Name, user3.Name}).Count(&count10).Error; err != nil || count10 != 3 {
t.Fatalf("Count should be 3, but got count: %v err %v", count10, err)
}
} }