HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 19b206912e into 33fc33b2f5

This commit is contained in:
MURAOKA Taro 2019-10-13 10:32:25 +00:00 committed by GitHub
parent 33fc33b2f5 19b206912e
commit 300ba98369
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
session_convert.go
View File

@ -544,6 +544,9 @@ func (session *Session) value2Interface(col *core.Column, fieldValue reflect.Val
return 0, err return 0, err
} }
if col.SQLType.IsBlob() { if col.SQLType.IsBlob() {
if data == nil {
return nil, nil
}
return data, nil return data, nil
} }
return string(data), nil return string(data), nil
@ -556,6 +559,9 @@ func (session *Session) value2Interface(col *core.Column, fieldValue reflect.Val
return 0, err return 0, err
} }
if col.SQLType.IsBlob() { if col.SQLType.IsBlob() {
if data == nil {
return nil, nil
}
return data, nil return data, nil
} }
return string(data), nil return string(data), nil

4
statement.go
View File

@ -319,8 +319,10 @@ func (statement *Statement) buildUpdates(bean interface{},
if err != nil { if err != nil {
engine.logger.Error(err) engine.logger.Error(err)
} else { } else {
if data != nil {
val = data val = data
} }
}
goto APPEND goto APPEND
} }
} }
@ -330,8 +332,10 @@ func (statement *Statement) buildUpdates(bean interface{},
if err != nil { if err != nil {
engine.logger.Error(err) engine.logger.Error(err)
} else { } else {
if data != nil {
val = data val = data
} }
}
goto APPEND goto APPEND
} }