Do not ignore order on distinct query

This commit is contained in:
matematik7 2017-08-14 20:47:26 +02:00
parent c3bb6aaa82
commit 5f381a30c4

View File

@ -2,7 +2,6 @@ package gorm
import (
"fmt"
"regexp"
)
type search struct {
@ -73,13 +72,7 @@ func (s *search) Order(value interface{}, reorder ...bool) *search {
return s
}
var distinctSQLRegexp = regexp.MustCompile(`(?i)distinct[^a-z]+[a-z]+`)
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}
return s
}