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

move dir and add ut for ParseOrder

Browse Source
This commit is contained in:
jianzhiyao
2020-10-27 19:32:56 +08:00
parent beedfa1b53
commit 6d828e7939
10 changed files with 179 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/orm/db_tables.go
View File

@@ -16,7 +16,8 @@ package orm
import (
"fmt"
"github.com/astaxie/beego/client/orm/structs/clauses"
"github.com/astaxie/beego/client/orm/structs"
"github.com/astaxie/beego/client/orm/structs/clauses/order"
"strings"
"time"
)
@@ -422,7 +423,7 @@ func (t *dbTables) getGroupSQL(groups []string) (groupSQL string) {
}
// generate order sql.
func (t *dbTables) getOrderSQL(orders []*clauses.Order) (orderSQL string) {
func (t *dbTables) getOrderSQL(orders []*order.Order) (orderSQL string) {
if len(orders) == 0 {
return
}
@@ -432,7 +433,7 @@ func (t *dbTables) getOrderSQL(orders []*clauses.Order) (orderSQL string) {
orderSqls := make([]string, 0, len(orders))
for _, order := range orders {
column := order.GetColumn()
clause := strings.Split(column, clauses.ExprDot)
clause := strings.Split(column, structs.ExprDot)
if order.IsRaw() {
if len(clause) == 2 {