bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-06 02:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve order feature for gdb.Model

Browse Source
This commit is contained in:
John Guo
2022-03-09 21:02:08 +08:00
parent fa57634505
commit 1625fc6f7e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
database/gdb/gdb_model_order_group.go
View File

@ -7,8 +7,10 @@
package gdb
import (
"github.com/gogf/gf/v2/util/gconv"
"strings"
"github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/gconv"
)
// Order sets the "ORDER BY" statement for the model.
@ -16,7 +18,8 @@ import (
// Eg:
// Order("id desc")
// Order("id", "desc").
// Order("id desc,name asc").
// Order("id desc,name asc")
// Order("id desc").Order("name asc")
// Order(gdb.Raw("field(id, 3,1,2)")).
func (m *Model) Order(orderBy ...interface{}) *Model {
if len(orderBy) == 0 {
@ -26,13 +29,14 @@ func (m *Model) Order(orderBy ...interface{}) *Model {
if model.orderBy != "" {
model.orderBy += ","
}
for _, o := range orderBy {
if v, ok := o.(Raw); ok {
for _, v := range orderBy {
switch v.(type) {
case Raw, *Raw:
model.orderBy += gconv.String(v)
return model
}
}
model.orderBy += model.db.GetCore().QuoteString(strings.Join(gconv.SliceStr(orderBy), " "))
model.orderBy += model.db.GetCore().QuoteString(gstr.JoinAny(orderBy, " "))
return model
}