Assign id attributes first in Active Record attribute assignment

Instead of assigning hashes later, we can assign IDs first to maintain
the same behaviour for nested attribute assignment. Deferring hash
assignment causes problems in store scenarios where an attribute can be
assigned two different ways, which had worked since Rails 7.2.

Author: gmcgibbon

activerecord/lib/active_record/attribute_assignment.rb

@@ -4,27 +4,30 @@ module ActiveRecord
   module AttributeAssignment
     private
       def _assign_attributes(attributes)
-        multi_parameter_attributes = nested_parameter_attributes = nil
+        foreign_keys = foreign_key_column_names
+        foreign_key_attributes = nil
+        normal_attributes = {}
+        multi_parameter_attributes = nil
 
         attributes.each do |k, v|
           key = k.to_s
 
-          if key.include?("(")
+          if key.in?(foreign_keys)
+            (foreign_key_attributes ||= {})[key] = v
+          elsif key.include?("(")
             (multi_parameter_attributes ||= {})[key] = v
-          elsif v.is_a?(Hash)
-            (nested_parameter_attributes ||= {})[key] = v
           else
-            _assign_attribute(key, v)
+            normal_attributes[key] = v
           end
         end
 
-        assign_nested_parameter_attributes(nested_parameter_attributes) if nested_parameter_attributes
+        foreign_key_attributes.each { |key, value| _assign_attribute(key, value) } if foreign_key_attributes
+        normal_attributes.each { |key, value| _assign_attribute(key, value)  }
         assign_multiparameter_attributes(multi_parameter_attributes) if multi_parameter_attributes
       end
 
-      # Assign any deferred nested attributes after the base attributes have been set.
-      def assign_nested_parameter_attributes(pairs)
-        pairs.each { |k, v| _assign_attribute(k, v) }
+      def foreign_key_column_names
+        self.class._reflections.values.grep(Reflection::BelongsToReflection).map(&:foreign_key)
       end
 
       # Instantiates objects for all attribute classes that needs more than one constructor parameter. This is done

activerecord/test/cases/store_test.rb

@@ -220,6 +220,14 @@ class StoreTest < ActiveRecord::TestCase
     assert_equal "blue", user.color[:jenny]
   end
 
+  test "update store and accessor" do
+    user = Admin::User.find_by_name("Jamis")
+    user.update(settings: { homepage: "not rails" }, homepage: "rails")
+
+    assert_equal "rails", user.settings[:homepage]
+    assert_equal "rails", user.homepage
+  end
+
   def test_convert_store_attributes_from_Hash_to_HashWithIndifferentAccess_saving_the_data_and_access_attributes_indifferently
     user = Admin::User.find_by_name("Jamis")
     assert_equal "symbol",  user.settings[:symbol]