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

Scan value into ignored fields if there is no ambiguity

This commit is contained in:
Jinzhu 2015-12-11 11:45:22 +08:00
parent 8ee49893d1
commit 341703ed5d
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
field.go
View File

@ -62,12 +62,14 @@ func (scope *Scope) Fields() map[string]*Field {
indirectValue := scope.IndirectValue() indirectValue := scope.IndirectValue()
isStruct := indirectValue.Kind() == reflect.Struct isStruct := indirectValue.Kind() == reflect.Struct
for _, structField := range modelStruct.StructFields { for _, structField := range modelStruct.StructFields {
if field, ok := fields[structField.DBName]; !ok || field.IsIgnored {
if isStruct { if isStruct {
fields[structField.DBName] = getField(indirectValue, structField) fields[structField.DBName] = getField(indirectValue, structField)
} else { } else {
fields[structField.DBName] = &Field{StructField: structField, IsBlank: true} fields[structField.DBName] = &Field{StructField: structField, IsBlank: true}
} }
} }
}
if modelStruct.cached { if modelStruct.cached {
scope.fields = fields scope.fields = fields

5
model_struct.go
View File

@ -149,7 +149,8 @@ func (scope *Scope) GetModelStruct() *ModelStruct {
if fieldStruct.Tag.Get("sql") == "-" { if fieldStruct.Tag.Get("sql") == "-" {
field.IsIgnored = true field.IsIgnored = true
} else { }
sqlSettings := parseTagSetting(field.Tag.Get("sql")) sqlSettings := parseTagSetting(field.Tag.Get("sql"))
gormSettings := parseTagSetting(field.Tag.Get("gorm")) gormSettings := parseTagSetting(field.Tag.Get("gorm"))
if _, ok := gormSettings["PRIMARY_KEY"]; ok { if _, ok := gormSettings["PRIMARY_KEY"]; ok {
@ -166,7 +167,7 @@ func (scope *Scope) GetModelStruct() *ModelStruct {
} else { } else {
field.DBName = ToDBName(fieldStruct.Name) field.DBName = ToDBName(fieldStruct.Name)
} }
}
fields = append(fields, field) fields = append(fields, field)
} }
} }