server/beego
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support sort none

Browse Source
This commit is contained in:
Anker Jam 2020-10-25 23:16:41 +08:00
parent 544c621017
commit b1d5ba8ece
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/orm/db_tables.go
View File

@ -434,9 +434,9 @@ func (t *dbTables) getOrderSQL(orders []*clauses.Order) (orderSQL string) {
column := order.GetColumn() column := order.GetColumn()
var sort string var sort string
switch order.GetSort() { switch order.GetSort() {
case clauses.ASCENDING: case clauses.SortAscending:
sort = "ASC" sort = "ASC"
case clauses.DESCENDING: case clauses.SortDescending:
sort = "DESC" sort = "DESC"
} }
clause := strings.Split(column, ExprSep) clause := strings.Split(column, ExprSep)

9
client/orm/structs/clauses/order.go
View File

@ -3,8 +3,9 @@ package clauses
type Sort int8 type Sort int8
const ( const (
ASCENDING Sort = 1 SortNone Sort = 0
DESCENDING Sort = 2 SortAscending Sort = 1
SortDescending Sort = 2
) )
type Order struct { type Order struct {
@ -23,10 +24,10 @@ func (o *Order) GetSort() Sort {
func ParseOrder(expressions ...string) []*Order { func ParseOrder(expressions ...string) []*Order {
var orders []*Order var orders []*Order
for _, expression := range expressions { for _, expression := range expressions {
sort := ASCENDING sort := SortAscending
column := expression column := expression
if expression[0] == '-' { if expression[0] == '-' {
sort = DESCENDING sort = SortDescending
column = expression[1:] column = expression[1:]
} }