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

Skip order sql when quering with distinct

This commit is contained in:
Jinzhu 2016-12-01 16:16:20 +08:00
parent 066abcef40
commit eb06255b66
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scope.go
View File

@ -734,7 +734,7 @@ func (scope *Scope) selectSQL() string {
} }
func (scope *Scope) orderSQL() string { func (scope *Scope) orderSQL() string {
if len(scope.Search.orders) == 0 || scope.Search.countingQuery { if len(scope.Search.orders) == 0 || scope.Search.ignoreOrderQuery {
return "" return ""
} }
@ -927,7 +927,7 @@ func (scope *Scope) count(value interface{}) *Scope {
if query, ok := scope.Search.selects["query"]; !ok || !regexp.MustCompile("(?i)^count(.+)$").MatchString(fmt.Sprint(query)) { if query, ok := scope.Search.selects["query"]; !ok || !regexp.MustCompile("(?i)^count(.+)$").MatchString(fmt.Sprint(query)) {
scope.Search.Select("count(*)") scope.Search.Select("count(*)")
} }
scope.Search.countingQuery = true scope.Search.ignoreOrderQuery = true
scope.Err(scope.row().Scan(value)) scope.Err(scope.row().Scan(value))
return scope return scope
} }

13
search.go
View File

@ -1,6 +1,9 @@
package gorm package gorm
import "fmt" import (
"fmt"
"regexp"
)
type search struct { type search struct {
db *DB db *DB
@ -21,7 +24,7 @@ type search struct {
tableName string tableName string
raw bool raw bool
Unscoped bool Unscoped bool
countingQuery bool ignoreOrderQuery bool
} }
type searchPreload struct { type searchPreload struct {
@ -70,7 +73,13 @@ func (s *search) Order(value interface{}, reorder ...bool) *search {
return s return s
} }
var distinctSQLRegexp = regexp.MustCompile(`(?i)distinct[^a-z]+[a-z]+`)
func (s *search) Select(query interface{}, args ...interface{}) *search { func (s *search) Select(query interface{}, args ...interface{}) *search {
if distinctSQLRegexp.MatchString(fmt.Sprint(query)) {
s.ignoreOrderQuery = true
}
s.selects = map[string]interface{}{"query": query, "args": args} s.selects = map[string]interface{}{"query": query, "args": args}
return s return s
} }