mirror
/
gorm
mirror of https://github.com/go-gorm/gorm.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #234 from tstorch/small_refactor 

Minor Refactoring for readability
This commit is contained in:
Jinzhu 2014-09-26 21:56:39 +08:00
parent 81874feef9 f771ee21da
commit eb7ba964b2
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scope.go
View File

@ -352,7 +352,7 @@ func (scope *Scope) fieldFromStruct(fieldStruct reflect.StructField, withRelatio
case reflect.Struct: case reflect.Struct:
if field.IsTime() || field.IsScanner() { if field.IsTime() || field.IsScanner() {
field.IsNormal = true field.IsNormal = true
} else if embedded := settings["EMBEDDED"]; strings.ToUpper(embedded) == "EMBEDDED" || (embedded == "" && fieldStruct.Anonymous) { } else if _, ok := settings["EMBEDDED"]; ok || fieldStruct.Anonymous {
var fields []*Field var fields []*Field
if field.Field.CanAddr() { if field.Field.CanAddr() {
for _, field := range scope.New(field.Field.Addr().Interface()).Fields() { for _, field := range scope.New(field.Field.Addr().Interface()).Fields() {
@ -362,18 +362,25 @@ func (scope *Scope) fieldFromStruct(fieldStruct reflect.StructField, withRelatio
} }
return fields return fields
} else if withRelation { } else if withRelation {
if foreignKey == "" && scope.HasColumn(field.Name+"Id") { var belongsToForeignKey, hasOneForeignKey, kind string
field.Relationship = &relationship{ForeignKey: field.Name + "Id", Kind: "belongs_to"}
} else if scope.HasColumn(foreignKey) { if foreignKey == "" {
field.Relationship = &relationship{ForeignKey: foreignKey, Kind: "belongs_to"} belongsToForeignKey = field.Name + "Id"
hasOneForeignKey = scopeTyp.Name() + "Id"
} else { } else {
if foreignKey == "" { belongsToForeignKey = foreignKey
foreignKey = scopeTyp.Name() + "Id" hasOneForeignKey = foreignKey
}
if reflect.New(typ).Elem().FieldByName(foreignKey).IsValid() {
field.Relationship = &relationship{ForeignKey: foreignKey, Kind: "has_one"}
}
} }
if scope.HasColumn(belongsToForeignKey) {
foreignKey = belongsToForeignKey
kind = "belongs_to"
} else {
foreignKey = hasOneForeignKey
kind = "has_one"
}
field.Relationship = &relationship{ForeignKey: foreignKey, Kind: kind}
} }
default: default:
field.IsNormal = true field.IsNormal = true