re
/
gorm
forked from mirror/gorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow to use Valuer with Eq expression, #3899

This commit is contained in:
Jinzhu 2020-12-30 10:42:13 +08:00
parent 065787c54e
commit 6c0ee2700a
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clause/expression.go
View File

@ -301,6 +301,10 @@ func (like Like) NegationBuild(builder Builder) {
} }
func eqNil(value interface{}) bool { func eqNil(value interface{}) bool {
if valuer, ok := value.(driver.Valuer); ok {
value, _ = valuer.Value()
}
return value == nil || eqNilReflect(value) return value == nil || eqNilReflect(value)
} }

7
clause/expression_test.go
View File

@ -112,21 +112,22 @@ func TestExpression(t *testing.T) {
clause.Eq{Column: column, Value: "column-value"}, clause.Eq{Column: column, Value: "column-value"},
}, },
Result: "`column-name` = ?", Result: "`column-name` = ?",
},{ }, {
Expressions: []clause.Expression{ Expressions: []clause.Expression{
clause.Eq{Column: column, Value: nil}, clause.Eq{Column: column, Value: nil},
clause.Eq{Column: column, Value: (*string)(nil)}, clause.Eq{Column: column, Value: (*string)(nil)},
clause.Eq{Column: column, Value: (*int)(nil)}, clause.Eq{Column: column, Value: (*int)(nil)},
clause.Eq{Column: column, Value: (*bool)(nil)}, clause.Eq{Column: column, Value: (*bool)(nil)},
clause.Eq{Column: column, Value: (interface{})(nil)}, clause.Eq{Column: column, Value: (interface{})(nil)},
clause.Eq{Column: column, Value: sql.NullString{String: "", Valid: false}},
}, },
Result: "`column-name` IS NULL", Result: "`column-name` IS NULL",
},{ }, {
Expressions: []clause.Expression{ Expressions: []clause.Expression{
clause.Neq{Column: column, Value: "column-value"}, clause.Neq{Column: column, Value: "column-value"},
}, },
Result: "`column-name` <> ?", Result: "`column-name` <> ?",
},{ }, {
Expressions: []clause.Expression{ Expressions: []clause.Expression{
clause.Neq{Column: column, Value: nil}, clause.Neq{Column: column, Value: nil},
clause.Neq{Column: column, Value: (*string)(nil)}, clause.Neq{Column: column, Value: (*string)(nil)},