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

Fix all tests

This commit is contained in:
Jinzhu 2015-02-17 18:37:47 +08:00
parent d6439f4147
commit a38f83527a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
model_struct.go
View File

@ -103,7 +103,11 @@ func (scope *Scope) GetModelStruct() *ModelStruct {
if reflectValue.Kind() == reflect.Slice { if reflectValue.Kind() == reflect.Slice {
reflectValue = reflect.Indirect(reflect.New(reflectValue.Type().Elem())) reflectValue = reflect.Indirect(reflect.New(reflectValue.Type().Elem()))
} }
scopeType := reflectValue.Type() scopeType := reflectValue.Type()
if scopeType.Kind() == reflect.Ptr {
scopeType = scopeType.Elem()
}
if scopeType.Kind() != reflect.Struct { if scopeType.Kind() != reflect.Struct {
return &modelStruct return &modelStruct

2
scope.go
View File

@ -96,7 +96,7 @@ func (scope *Scope) HasError() bool {
func (scope *Scope) PrimaryKeyField() *Field { func (scope *Scope) PrimaryKeyField() *Field {
if field := scope.GetModelStruct().PrimaryKeyField; field != nil { if field := scope.GetModelStruct().PrimaryKeyField; field != nil {
return scope.getField(field) return scope.Fields()[field.DBName]
} }
return nil return nil
} }