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

Fix test TestHasOneAndHasManyAssociation

This commit is contained in:
Jinzhu 2015-07-30 18:41:43 +08:00
parent 4e8272cf9d
commit 7decf73356
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
association_test.go
View File

@ -23,11 +23,11 @@ func TestHasOneAndHasManyAssociation(t *testing.T) {
} }
if err := DB.Save(&post).Error; err != nil { if err := DB.Save(&post).Error; err != nil {
t.Errorf("Got errors when save post") t.Errorf("Got errors when save post", err.Error())
} }
if DB.First(&Category{}, "name = ?", "Category 1").Error != nil { if err := DB.First(&Category{}, "name = ?", "Category 1").Error; err != nil {
t.Errorf("Category should be saved") t.Errorf("Category should be saved", err.Error())
} }
var p Post var p Post

6
callback_shared.go
View File

@ -52,8 +52,8 @@ func SaveAfterAssociations(scope *Scope) {
if relationship.JoinTableHandler == nil && len(relationship.ForeignFieldNames) != 0 { if relationship.JoinTableHandler == nil && len(relationship.ForeignFieldNames) != 0 {
for idx, fieldName := range relationship.ForeignFieldNames { for idx, fieldName := range relationship.ForeignFieldNames {
associationForeignName := relationship.AssociationForeignDBNames[idx] associationForeignName := relationship.AssociationForeignDBNames[idx]
if f, ok := scope.New(value.Addr().Interface()).FieldByName(associationForeignName); ok { if f, ok := scope.FieldByName(associationForeignName); ok {
scope.Err(scope.SetColumn(fieldName, f.Field.Interface())) scope.Err(newScope.SetColumn(fieldName, f.Field.Interface()))
} }
} }
} }
@ -75,7 +75,7 @@ func SaveAfterAssociations(scope *Scope) {
for idx, fieldName := range relationship.ForeignFieldNames { for idx, fieldName := range relationship.ForeignFieldNames {
associationForeignName := relationship.AssociationForeignDBNames[idx] associationForeignName := relationship.AssociationForeignDBNames[idx]
if f, ok := scope.New(value.Addr().Interface()).FieldByName(associationForeignName); ok { if f, ok := scope.New(value.Addr().Interface()).FieldByName(associationForeignName); ok {
scope.Err(scope.SetColumn(fieldName, f.Field.Interface())) scope.Err(newScope.SetColumn(fieldName, f.Field.Interface()))
} }
} }
} }

11
model_struct.go
View File

@ -299,12 +299,11 @@ func (scope *Scope) GetModelStruct() *ModelStruct {
} }
continue continue
} else { } else {
belongsToForeignKeys := foreignKeys if len(foreignKeys) == 0 {
if len(belongsToForeignKeys) == 0 { for _, f := range toScope.PrimaryFields() {
for _, field := range toScope.PrimaryFields() { if foreignField := getForeignField(field.Name+f.Name, fields); foreignField != nil {
if foreignField := getForeignField(field.Name+field.Name, fields); foreignField != nil { relationship.AssociationForeignFieldNames = append(relationship.AssociationForeignFieldNames, f.Name)
relationship.AssociationForeignFieldNames = append(relationship.AssociationForeignFieldNames, field.Name) relationship.AssociationForeignDBNames = append(relationship.AssociationForeignDBNames, f.DBName)
relationship.AssociationForeignDBNames = append(relationship.AssociationForeignDBNames, field.DBName)
relationship.ForeignFieldNames = append(relationship.ForeignFieldNames, foreignField.Name) relationship.ForeignFieldNames = append(relationship.ForeignFieldNames, foreignField.Name)
relationship.ForeignDBNames = append(relationship.ForeignDBNames, foreignField.DBName) relationship.ForeignDBNames = append(relationship.ForeignDBNames, foreignField.DBName)
foreignField.IsForeignKey = true foreignField.IsForeignKey = true