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

Merge pull request #1401 from ginodeis/fix-empty-string-order 

Fix empty string as order/sort clause
This commit is contained in:
Jinzhu 2017-03-27 23:13:47 +08:00 committed by GitHub
parent 66d5b42ee9 d03afd173f
commit 45ccb13437
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
query_test.go
View File

@ -360,6 +360,11 @@ func TestOrderAndPluck(t *testing.T) {
t.Errorf("Order with multiple orders") t.Errorf("Order with multiple orders")
} }
var ages6 []int64
if err := scopedb.Order("").Pluck("age", &ages6).Error; err != nil {
t.Errorf("An empty string as order clause produces invalid queries")
}
DB.Model(User{}).Select("name, age").Find(&[]User{}) DB.Model(User{}).Select("name, age").Find(&[]User{})
} }

2
search.go
View File

@ -67,7 +67,7 @@ func (s *search) Order(value interface{}, reorder ...bool) *search {
s.orders = []interface{}{} s.orders = []interface{}{}
} }
if value != nil { if value != nil && value != "" {
s.orders = append(s.orders, value) s.orders = append(s.orders, value)
} }
return s return s