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

Merge branch 'RichardKnop-bugfix/preload_indirect_zero_value_check'

This commit is contained in:
Jinzhu 2015-12-16 10:27:09 +08:00
parent 15169e635a e69ffaa9c4
commit b2a66e79e8
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
preload.go
View File

@ -10,8 +10,15 @@ import (
func getRealValue(value reflect.Value, columns []string) (results []interface{}) {
for _, column := range columns {
if reflect.Indirect(value).FieldByName(column).IsValid() {
result := reflect.Indirect(value).FieldByName(column).Interface()
pointedValue := reflect.Indirect(value)
// If v is a nil pointer, Indirect returns a zero Value!
// Therefor we need to check for a zero value,
// as FieldByName could panic
if !pointedValue.IsValid() {
continue
}
if pointedValue.FieldByName(column).IsValid() {
result := pointedValue.FieldByName(column).Interface()
if r, ok := result.(driver.Valuer); ok {
result, _ = r.Value()
}
@ -290,6 +297,12 @@ func (scope *Scope) handleManyToManyPreload(field *Field, conditions []interface
}
}
} else {
// If v is a nil pointer, Indirect returns a zero Value!
// Therefor we need to check for a zero value,
// as FieldByName could panic
if !scope.IndirectValue().IsValid() {
return
}
object := scope.IndirectValue()
source := getRealValue(object, associationForeignStructFieldNames)
field := object.FieldByName(field.Name)