tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix count() bug

Browse Source
This commit is contained in:
Code 2017-04-07 03:54:03 +08:00
parent 2bd6928400
commit 238d1d8de8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scope.go
View File

@ -335,7 +335,7 @@ func (scope *Scope) CombinedConditionSql() string {
whereSql = strings.TrimSuffix(strings.TrimPrefix(whereSql, "WHERE ("), ")") whereSql = strings.TrimSuffix(strings.TrimPrefix(whereSql, "WHERE ("), ")")
} }
return joinSql + whereSql + scope.groupSQL() + return joinSql + whereSql + scope.groupSQL() +
scope.havingSQL() + scope.orderSQL() + scope.limitAndOffsetSQL() scope.havingSQL() + scope.orderSQL() + scope.limitAndOffsetSQL() + scope.Search.countEnd
} }
// Raw set raw sql // Raw set raw sql
@ -942,7 +942,7 @@ func (scope *Scope) count(value interface{}) *Scope {
if query, ok := scope.Search.selects["query"]; !ok || !countingQueryRegexp.MatchString(fmt.Sprint(query)) { if query, ok := scope.Search.selects["query"]; !ok || !countingQueryRegexp.MatchString(fmt.Sprint(query)) {
if len(scope.Search.group) != 0 { if len(scope.Search.group) != 0 {
scope.Search.Select("count(*) FROM ( SELECT count(*) ") scope.Search.Select("count(*) FROM ( SELECT count(*) ")
scope.Search.group += " ) AS count" scope.Search.countEnd = " ) AS count"
} else { } else {
scope.Search.Select("count(*)") scope.Search.Select("count(*)")
} }