Merge pull request #12621 from laurocaetano/fix_has_one_association_with_primary_key_set

Save association when primary key is manually set

Conflicts:
	activerecord/CHANGELOG.md

1 files changed, 7 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb
index 561b2dd6d1..e9622ca0c1 100644
--- a/activerecord/lib/active_record/autosave_association.rb
+++ b/activerecord/lib/active_record/autosave_association.rb
@@ -384,7 +384,8 @@ module ActiveRecord
             record.destroy
           else
             key = reflection.options[:primary_key] ? send(reflection.options[:primary_key]) : id
-            if autosave != false && (new_record? || record.new_record? || record[reflection.foreign_key] != key || autosave)
+            if autosave != false && (autosave || new_record? || record_changed?(reflection, record, key))
+
               unless reflection.through_reflection
                 record[reflection.foreign_key] = key
               end
@@ -397,6 +398,11 @@ module ActiveRecord
         end
       end
 
+      # If the record is new or it has changed, returns true.
+      def record_changed?(reflection, record, key)
+        record.new_record? || record[reflection.foreign_key] != key || record.attribute_changed?(reflection.foreign_key)
+      end
+
       # Saves the associated record if it's new or <tt>:autosave</tt> is enabled.
       #
       # In addition, it will destroy the association if it was marked for destruction.