xorm/builder
14
18
Fork 16
Code Issues 8 Pull Requests Actions Releases 1 Activity

fix bug on condif #54

Merged
lunny merged 1 commits from lunny/fix_if into master 2019-04-22 08:26:14 +00:00
Conversation 0 Commits 1 Files Changed 2 +20 -7
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cond_if.go
View File

@ -42,5 +42,8 @@ func (condIf condIf) Or(conds ...Cond) Cond {
}
func (condIf condIf) IsValid() bool {
return condIf.condTrue != nil
if condIf.condition {
return condIf.condTrue != nil
}
return condIf.condFalse != nil
}

22
cond_if_test.go
View File

@ -11,18 +11,28 @@ import (
)
func TestCond_If(t *testing.T) {
var cond = If(1 > 0, Eq{"a": 1}, Eq{"b": 1})
sql, err := ToBoundSQL(cond)
cond1 := If(1 > 0, Eq{"a": 1}, Eq{"b": 1})
sql, err := ToBoundSQL(cond1)
assert.NoError(t, err)
assert.EqualValues(t, "a=1", sql)
cond = If(1 < 0, Eq{"a": 1}, Eq{"b": 1})
sql, err = ToBoundSQL(cond)
cond2 := If(1 < 0, Eq{"a": 1}, Eq{"b": 1})
sql, err = ToBoundSQL(cond2)
assert.NoError(t, err)
assert.EqualValues(t, "b=1", sql)
cond = If(1 > 0, cond, Eq{"c": 1})
sql, err = ToBoundSQL(cond)
cond3 := If(1 > 0, cond2, Eq{"c": 1})
sql, err = ToBoundSQL(cond3)
assert.NoError(t, err)
assert.EqualValues(t, "b=1", sql)
cond4 := If(2 < 0, Eq{"d": "a"})
sql, err = ToBoundSQL(cond4)
assert.NoError(t, err)
assert.EqualValues(t, "", sql)
cond5 := And(cond1, cond2, cond3, cond4)
sql, err = ToBoundSQL(cond5)
assert.NoError(t, err)
assert.EqualValues(t, "a=1 AND b=1 AND b=1", sql)
}