Merge e7666dac9a34a08ea27b37d95cf8e119fe432322 into aa3fd6de13fee7e0ae715eeaad3bc2f329db2366

This commit is contained in:
Joseph M Persie 2018-02-10 06:33:13 +00:00 committed by GitHub
commit f38931e3e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,22 +13,21 @@ func commitOrRollbackTransactionCallback(scope *Scope) {
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 true, field.Relationship
}
return false, field.Relationship
}
return false, nil
}
func saveBeforeAssociationsCallback(scope *Scope) {
if !scope.shouldSaveAssociations() {
return
}
for _, field := range scope.Fields() {
if ok, relationship := saveFieldAsAssociation(scope, field); ok && relationship.Kind == "belongs_to" {
ok, relationship := saveFieldAsAssociation(scope, field)
if relationship != nil && relationship.Kind == "belongs_to" {
fieldValue := field.Field.Addr().Interface()
scope.Err(scope.NewDB().Save(fieldValue).Error)
if ok && scope.shouldSaveAssociations() {
scope.Err(scope.NewDB().Save(fieldValue).Error)
}
if len(relationship.ForeignFieldNames) != 0 {
// set value's foreign key
for idx, fieldName := range relationship.ForeignFieldNames {
@ -47,7 +46,7 @@ func saveAfterAssociationsCallback(scope *Scope) {
return
}
for _, field := range scope.Fields() {
if ok, relationship := saveFieldAsAssociation(scope, field); ok &&
if ok, relationship := saveFieldAsAssociation(scope, field); ok && relationship != nil &&
(relationship.Kind == "has_one" || relationship.Kind == "has_many" || relationship.Kind == "many_to_many") {
value := field.Field