mirror
/
gorm
mirror of https://github.com/go-gorm/gorm.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v1.0_dev

This commit is contained in:
Jinzhu 2016-03-04 22:01:23 +08:00
parent e0cca89ce3 f8377d80bf
commit 41ab9f433f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scope_private.go
View File

@ -230,8 +230,6 @@ func (scope *Scope) whereSql() (sql string) {
return return
} }
var hasCountRegexp = regexp.MustCompile(`(?i)count\(.+\)`)
func (scope *Scope) selectSql() string { func (scope *Scope) selectSql() string {
if len(scope.Search.selects) == 0 { if len(scope.Search.selects) == 0 {
if len(scope.Search.joinConditions) > 0 { if len(scope.Search.joinConditions) > 0 {
@ -239,9 +237,7 @@ func (scope *Scope) selectSql() string {
} }
return "*" return "*"
} }
sql := scope.buildSelectQuery(scope.Search.selects) return scope.buildSelectQuery(scope.Search.selects)
scope.Search.countingQuery = (len(scope.Search.group) == 0) && hasCountRegexp.MatchString(sql)
return sql
} }
func (scope *Scope) orderSql() string { func (scope *Scope) orderSql() string {
@ -391,6 +387,7 @@ func (scope *Scope) pluck(column string, value interface{}) *Scope {
func (scope *Scope) count(value interface{}) *Scope { func (scope *Scope) count(value interface{}) *Scope {
scope.Search.Select("count(*)") scope.Search.Select("count(*)")
scope.Search.countingQuery = true
scope.Err(scope.row().Scan(value)) scope.Err(scope.row().Scan(value))
return scope return scope
} }