lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-06-28 00:54:13 +00:00
Code Issues Releases Activity

merge switch cases

Browse Source
This commit is contained in:
zav8 2018-12-06 16:09:39 +08:00
parent 5e4241fc87
commit 6da4a66c20
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
orm/orm_raw.go
View File

@ -152,7 +152,7 @@ func (o *rawSet) setFieldValue(ind reflect.Value, value interface{}) {
ind.Set(reflect.Zero(ind.Type())) ind.Set(reflect.Zero(ind.Type()))
return return
} }
switch indi := ind.Interface().(type) { switch ind.Interface().(type) {
case time.Time: case time.Time:
var str string var str string
switch d := value.(type) { switch d := value.(type) {
@ -180,25 +180,15 @@ func (o *rawSet) setFieldValue(ind reflect.Value, value interface{}) {
} }
} }
} }
case sql.NullString: case sql.NullString, sql.NullInt64, sql.NullFloat64, sql.NullBool:
err := indi.Scan(value) indi := reflect.New(ind.Type()).Interface()
if err == nil { sc, ok := indi.(sql.Scanner)
ind.Set(reflect.ValueOf(indi)) if !ok {
return
} }
case sql.NullInt64: err := sc.Scan(value)
err := indi.Scan(value)
if err == nil { if err == nil {
ind.Set(reflect.ValueOf(indi)) ind.Set(reflect.Indirect(reflect.ValueOf(sc)))
}
case sql.NullFloat64:
err := indi.Scan(value)
if err == nil {
ind.Set(reflect.ValueOf(indi))
}
case sql.NullBool:
err := indi.Scan(value)
if err == nil {
ind.Set(reflect.ValueOf(indi))
} }
} }
} }