fix bug when query map condtion with no quote (#1449)

This commit is contained in:
Lunny Xiao 2019-10-05 14:36:18 +08:00 committed by GitHub
parent 6a47ef9b49
commit 57a49c6c23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 2 deletions

View File

@ -618,3 +618,28 @@ func TestCustomTypes(t *testing.T) {
assert.True(t, has) assert.True(t, has)
assert.EqualValues(t, 32, age) assert.EqualValues(t, 32, age)
} }
func TestGetViaMapCond(t *testing.T) {
type GetViaMapCond struct {
Id int64
Platform int
Index int
}
assert.NoError(t, prepareEngine())
assertSync(t, new(GetViaMapCond))
var (
r GetViaMapCond
platformStr = colMapper.Obj2Table("Platform")
indexStr = colMapper.Obj2Table("Index")
query = map[string]interface{}{
platformStr: 1,
indexStr: 1,
}
)
has, err := testEngine.Where(query).Get(&r)
assert.NoError(t, err)
assert.False(t, has)
}

View File

@ -149,8 +149,12 @@ func (statement *Statement) And(query interface{}, args ...interface{}) *Stateme
cond := builder.Expr(query.(string), args...) cond := builder.Expr(query.(string), args...)
statement.cond = statement.cond.And(cond) statement.cond = statement.cond.And(cond)
case map[string]interface{}: case map[string]interface{}:
cond := builder.Eq(query.(map[string]interface{})) queryMap := query.(map[string]interface{})
statement.cond = statement.cond.And(cond) newMap := make(map[string]interface{})
for k, v := range queryMap {
newMap[statement.Engine.Quote(k)] = v
}
statement.cond = statement.cond.And(builder.Eq(newMap))
case builder.Cond: case builder.Cond:
cond := query.(builder.Cond) cond := query.(builder.Cond)
statement.cond = statement.cond.And(cond) statement.cond = statement.cond.And(cond)