tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update clause.OrderBy to use Exprs instead of Expression

Browse Source
This commit is contained in:
Or Ben Chitrit 2025-02-19 21:29:28 +02:00
parent 553f0c62f8
commit 4817f2c3d3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/query_test.go
View File

@ -1025,7 +1025,7 @@ func TestOrder(t *testing.T) {
} }
stmt := dryDB.Clauses(clause.OrderBy{ stmt := dryDB.Clauses(clause.OrderBy{
Expression: clause.Expr{SQL: "FIELD(id,?)", Vars: []interface{}{[]int{1, 2, 3}}, WithoutParentheses: true}, Exprs: []clause.Expression{clause.Expr{SQL: "FIELD(id,?)", Vars: []interface{}{[]int{1, 2, 3}}, WithoutParentheses: true}},
}).Find(&User{}).Statement }).Find(&User{}).Statement
explainedSQL := dryDB.Dialector.Explain(stmt.SQL.String(), stmt.Vars...) explainedSQL := dryDB.Dialector.Explain(stmt.SQL.String(), stmt.Vars...)
@ -1050,7 +1050,7 @@ func TestOrderWithAllFields(t *testing.T) {
} }
stmt := dryDB.Clauses(clause.OrderBy{ stmt := dryDB.Clauses(clause.OrderBy{
Expression: clause.Expr{SQL: "FIELD(id,?)", Vars: []interface{}{[]int{1, 2, 3}}, WithoutParentheses: true}, Exprs: []clause.Expression{clause.Expr{SQL: "FIELD(id,?)", Vars: []interface{}{[]int{1, 2, 3}}, WithoutParentheses: true}},
}).Find(&User{}).Statement }).Find(&User{}).Statement
explainedSQL := dryDB.Dialector.Explain(stmt.SQL.String(), stmt.Vars...) explainedSQL := dryDB.Dialector.Explain(stmt.SQL.String(), stmt.Vars...)

2
tests/sql_builder_test.go
View File

@ -449,7 +449,7 @@ func TestToSQL(t *testing.T) {
// UpdateColumns // UpdateColumns
sql = DB.ToSQL(func(tx *gorm.DB) *gorm.DB { sql = DB.ToSQL(func(tx *gorm.DB) *gorm.DB {
return tx.Raw("SELECT * FROM users ?", clause.OrderBy{ return tx.Raw("SELECT * FROM users ?", clause.OrderBy{
Columns: []clause.OrderByColumn{{Column: clause.Column{Name: "id", Raw: true}, Desc: true}}, Exprs: []clause.Expression{clause.OrderByColumn{Column: clause.Column{Name: "id", Raw: true}, Desc: true}},
}) })
}) })
assertEqualSQL(t, `SELECT * FROM users ORDER BY id DESC`, sql) assertEqualSQL(t, `SELECT * FROM users ORDER BY id DESC`, sql)