blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 03:05:05 +08:00
Code Issues Projects Releases Wiki Activity

fix: orm generate sql wrong, issues #2782 (#2787)

Browse Source
This commit is contained in:
Agzer0 2023-07-25 20:13:17 +08:00 committed by GitHub
parent 4ad508c04d
commit 83fa3593b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
contrib/drivers/mysql/mysql_issue_test.go
View File

@ -760,3 +760,40 @@ func Test_Issue2439(t *testing.T) {
t.Assert(r[0]["name"], "a")
})
}
// https://github.com/gogf/gf/issues/2782
func Test_Issue2787(t *testing.T) {
table := createTable()
defer dropTable(table)
gtest.C(t, func(t *gtest.T) {
m := db.Model("user")
condWhere, _ := m.Builder().
Where("id", "").
Where(m.Builder().
Where("nickname", "foo").
WhereOr("password", "abc123")).
Where("passport", "pp").
Build()
t.Assert(condWhere, "(`id`=?) AND (((`nickname`=?) OR (`password`=?))) AND (`passport`=?)")
condWhere, _ = m.OmitEmpty().Builder().
Where("id", "").
Where(m.Builder().
Where("nickname", "foo").
WhereOr("password", "abc123")).
Where("passport", "pp").
Build()
t.Assert(condWhere, "((`nickname`=?) OR (`password`=?)) AND (`passport`=?)")
condWhere, _ = m.OmitEmpty().Builder().
Where(m.Builder().
Where("nickname", "foo").
WhereOr("password", "abc123")).
Where("id", "").
Where("passport", "pp").
Build()
t.Assert(condWhere, "((`nickname`=?) OR (`password`=?)) AND (`passport`=?)")
})
}

2
database/gdb/gdb_model_builder.go
View File

@ -115,7 +115,7 @@ func (b *WhereBuilder) convertWhereBuilder(where interface{}, args []interface{}
}
if builder != nil {
conditionWhere, conditionArgs := builder.Build()
if conditionWhere != "" && len(b.whereHolder) == 0 {
if conditionWhere != "" && (len(b.whereHolder) == 0 || len(builder.whereHolder) > 1) {
conditionWhere = "(" + conditionWhere + ")"
}
return conditionWhere, conditionArgs