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

fix bug for mis-converting uint64 to int64 (#1647) 

fix bug for mis-converting uint64 to int64

Co-authored-by: rosbit <me@rosbit.cn>
Reviewed-on: https://gitea.com/xorm/xorm/pulls/1647
This commit is contained in:
rosbit 2020-04-05 04:49:44 +00:00 committed by Lunny Xiao
parent 410c2de923
commit 7e981f5f5e
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/statements/statement.go
View File

@ -797,8 +797,7 @@ func (statement *Statement) buildConds2(table *schemas.Table, bean interface{},
if !requiredField && fieldValue.Uint() == 0 { if !requiredField && fieldValue.Uint() == 0 {
continue continue
} }
t := int64(fieldValue.Uint()) val = fieldValue.Interface()
val = reflect.ValueOf(&t).Interface()
case reflect.Struct: case reflect.Struct:
if fieldType.ConvertibleTo(schemas.TimeType) { if fieldType.ConvertibleTo(schemas.TimeType) {
t := fieldValue.Convert(schemas.TimeType).Interface().(time.Time) t := fieldValue.Convert(schemas.TimeType).Interface().(time.Time)

3
internal/statements/update.go
View File

@ -190,8 +190,7 @@ func (statement *Statement) BuildUpdates(tableValue reflect.Value,
if !requiredField && fieldValue.Uint() == 0 { if !requiredField && fieldValue.Uint() == 0 {
continue continue
} }
t := int64(fieldValue.Uint()) val = fieldValue.Interface()
val = reflect.ValueOf(&t).Interface()
case reflect.Struct: case reflect.Struct:
if fieldType.ConvertibleTo(schemas.TimeType) { if fieldType.ConvertibleTo(schemas.TimeType) {
t := fieldValue.Convert(schemas.TimeType).Interface().(time.Time) t := fieldValue.Convert(schemas.TimeType).Interface().(time.Time)

2
internal/statements/values.go
View File

@ -147,7 +147,7 @@ func (statement *Statement) Value2Interface(col *schemas.Column, fieldValue refl
} }
return nil, ErrUnSupportedType return nil, ErrUnSupportedType
case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint: case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uint:
return int64(fieldValue.Uint()), nil return fieldValue.Uint(), nil
default: default:
return fieldValue.Interface(), nil return fieldValue.Interface(), nil
} }