From 9235b47ea28d816ef25d6bf4e037ccb5c7c7096b Mon Sep 17 00:00:00 2001
From: joe-at-startupmedia <joseph.persie@startupmedia.com>
Date: Wed, 4 Oct 2017 08:19:16 +0000
Subject: [PATCH] Allows foreign keys to be saved without saving the
 assoication when specified #1628

---
 callback_save.go | 53 ++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/callback_save.go b/callback_save.go
index f4bc918e..ad4eda2f 100644
--- a/callback_save.go
+++ b/callback_save.go
@@ -11,35 +11,34 @@ 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 false, nil
+  if scope.changeableField(field) && !field.IsBlank && !field.IsIgnored {
+    if value, ok := field.TagSettings["SAVE_ASSOCIATIONS"]; !ok || (value != "false" && value != "skip") {
+      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" {
-			fieldValue := field.Field.Addr().Interface()
-			scope.Err(scope.NewDB().Save(fieldValue).Error)
-			if len(relationship.ForeignFieldNames) != 0 {
-				// set value's foreign key
-				for idx, fieldName := range relationship.ForeignFieldNames {
-					associationForeignName := relationship.AssociationForeignDBNames[idx]
-					if foreignField, ok := scope.New(fieldValue).FieldByName(associationForeignName); ok {
-						scope.Err(scope.SetColumn(fieldName, foreignField.Field.Interface()))
-					}
-				}
-			}
-		}
-	}
+  for _, field := range scope.Fields() {
+    ok, relationship := saveFieldAsAssociation(scope, field);
+    if relationship != nil && relationship.Kind == "belongs_to" {
+      fieldValue := field.Field.Addr().Interface()
+      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 {
+          associationForeignName := relationship.AssociationForeignDBNames[idx]
+          if foreignField, ok := scope.New(fieldValue).FieldByName(associationForeignName); ok {
+            scope.Err(scope.SetColumn(fieldName, foreignField.Field.Interface()))
+          }
+        }
+      }
+    }
+  }
 }
 
 func saveAfterAssociationsCallback(scope *Scope) {
@@ -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