From 544b88798d6c8a296f70710b414e7f5742398442 Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Sat, 20 Dec 2008 22:57:30 +0000 Subject: [PATCH] Assigning to the foreign key of a belongs to association should reset *all* associations with that foreign key --- activerecord/lib/active_record/associations.rb | 10 +++++++++- .../associations/belongs_to_associations_test.rb | 4 ++++ activerecord/test/models/company.rb | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index cc20d23..1c19e7c 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1286,7 +1286,15 @@ module ActiveRecord if association_proxy_class == BelongsToAssociation define_method("#{reflection.primary_key_name}=") do |target_id| - instance_variable_get(ivar).reset if instance_variable_defined?(ivar) + # Find all associations which use the same primary key and reset them + self.class.reflect_on_all_associations(:belongs_to).each do |assoc| + if reflection.primary_key_name.to_s == assoc.primary_key_name.to_s + proxy = instance_variable_get("@#{assoc.name}") + proxy.reset unless proxy.nil? + end + end + + # Write the new foreign key value write_attribute(reflection.primary_key_name, target_id) end end diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb index 223afc3..b86da17 100644 --- a/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -51,13 +51,17 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase # Test using an existing record signals37 = accounts(:signals37) assert_equal companies(:first_firm), signals37.firm + assert_equal companies(:first_firm), signals37.firm2 + signals37.firm_id = companies(:another_firm).id assert_equal companies(:another_firm), signals37.firm + assert_equal companies(:another_firm), signals37.firm2 # Test using a new record account = Account.new account.firm_id = companies(:another_firm).id assert_equal companies(:another_firm), account.firm + assert_equal companies(:another_firm), account.firm2 end def test_no_unexpected_aliasing diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index 0e3fafa..02dcd20 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -131,6 +131,7 @@ end class Account < ActiveRecord::Base belongs_to :firm + belongs_to :firm2, :foreign_key => :firm_id, :class_name => "Firm" def self.destroyed_account_ids @destroyed_account_ids ||= Hash.new { |h,k| h[k] = [] } -- 1.5.6.3