xorm/xorm
xorm/xorm
64
360
Fork 208
Code Issues 373 Pull Requests 17 Actions Releases 35 Activity

Add includeNil requiredField Check when custom struct field IsZero in Update method. #2438

Merged
lunny merged 7 commits from tylerthail2019/xorm:v1 into v1 2024-04-02 04:26:43 +00:00
Conversation 1 Commits 7 Files Changed 2 +23 -3
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/statements/update.go
View File

@ -126,7 +126,7 @@ func (statement *Statement) BuildUpdates(tableValue reflect.Value,
if fieldValue.CanAddr() {
if structConvert, ok := fieldValue.Addr().Interface().(convert.Conversion); ok {
if utils.IsZero(fieldValue.Interface()) {
if !includeNil && !requiredField && utils.IsZero(fieldValue.Interface()) {
continue
}
data, err := structConvert.ToDB()

24
tests/types_test.go
View File

@ -633,6 +633,9 @@ func (d *ZDecimal) FromDB(data []byte) error {
}
func (d ZDecimal) ToDB() ([]byte, error) {
if d.value == nil {
return []byte("0"), nil
}
return []byte(fmt.Sprintf("%d", (d.value).Int64())), nil
}
@ -688,6 +691,23 @@ func TestZDecimal(t *testing.T) {
assert.NoError(t, err)
assert.True(t, has)
assert.Equal(t, "test2", "test2")
assert.False(t, m.Amount.IsZero())
assert.Equal(t, "10000000000000000", m.Amount.String())
assert.False(t, m2.Amount.IsZero())
assert.Equal(t, "10000000000000000", m2.Amount.String())
_, err = testEngine.AllCols().Update(&ZMyMoney{
Id: 1,
Account: "test3",
})
assert.NoError(t, err)
var m3 = ZMyMoney{
Id: 1,
}
has, err = testEngine.Get(&m3)
assert.NoError(t, err)
assert.True(t, has)
assert.Equal(t, "test3", "test3")
assert.True(t, m3.Amount.IsZero())
assert.Equal(t, "0", m3.Amount.String())
}