Add tag to support skip nested save for associations

This commit is contained in:
Jinzhu 2016-10-27 10:31:46 +08:00
parent 56a7d1b69e
commit 4a540f3ac8
3 changed files with 80 additions and 47 deletions

View File

@ -884,3 +884,24 @@ func TestHasManyChildrenWithOneStruct(t *testing.T) {
DB.Save(&category)
}
func TestSkipSaveAssociation(t *testing.T) {
type Company struct {
gorm.Model
Name string
}
type User struct {
gorm.Model
Name string
CompanyID uint
Company Company `gorm:"save_associations:false"`
}
DB.AutoMigrate(&Company{}, &User{})
DB.Save(&User{Name: "jinzhu", Company: Company{Name: "skip_save_association"}})
if !DB.Where("name = ?", "skip_save_association").First(&Company{}).RecordNotFound() {
t.Errorf("Company skip_save_association should not been saved")
}
}

View File

@ -10,13 +10,23 @@ func commitOrRollbackTransactionCallback(scope *Scope) {
scope.CommitOrRollback()
}
func saveFieldAsAssociation(scope *Scope, field *Field) (bool, *Relationship) {
if scope.changeableField(field) && !field.IsBlank && !field.IsIgnored {
if value, ok := field.TagSettings["SAVE_ASSOCIATIONS"]; !ok || (value != "false" && value != "skip") {
if relationship := field.Relationship; relationship != nil {
return true, relationship
}
}
}
return false, nil
}
func saveBeforeAssociationsCallback(scope *Scope) {
if !scope.shouldSaveAssociations() {
return
}
for _, field := range scope.Fields() {
if scope.changeableField(field) && !field.IsBlank && !field.IsIgnored {
if relationship := field.Relationship; relationship != nil && relationship.Kind == "belongs_to" {
if ok, relationship := saveFieldAsAssociation(scope, field); ok && relationship.Kind == "belongs_to" {
fieldValue := field.Field.Addr().Interface()
scope.Err(scope.NewDB().Save(fieldValue).Error)
if len(relationship.ForeignFieldNames) != 0 {
@ -30,7 +40,6 @@ func saveBeforeAssociationsCallback(scope *Scope) {
}
}
}
}
}
func saveAfterAssociationsCallback(scope *Scope) {
@ -38,8 +47,7 @@ func saveAfterAssociationsCallback(scope *Scope) {
return
}
for _, field := range scope.Fields() {
if scope.changeableField(field) && !field.IsBlank && !field.IsIgnored {
if relationship := field.Relationship; relationship != nil &&
if ok, relationship := saveFieldAsAssociation(scope, field); ok &&
(relationship.Kind == "has_one" || relationship.Kind == "has_many" || relationship.Kind == "many_to_many") {
value := field.Field
@ -88,5 +96,4 @@ func saveAfterAssociationsCallback(scope *Scope) {
}
}
}
}
}

View File

@ -964,9 +964,14 @@ func (scope *Scope) changeableField(field *Field) bool {
}
func (scope *Scope) shouldSaveAssociations() bool {
if saveAssociations, ok := scope.Get("gorm:save_associations"); ok && !saveAssociations.(bool) {
if saveAssociations, ok := scope.Get("gorm:save_associations"); ok {
if v, ok := saveAssociations.(bool); ok && !v {
return false
}
if v, ok := saveAssociations.(string); ok && (v != "skip") {
return false
}
}
return true && !scope.HasError()
}