From e646d3bf574ad3ea7dc5b525511377559b2640dc Mon Sep 17 00:00:00 2001 From: Shintaro Kojima Date: Sat, 4 Apr 2015 12:24:48 +0000 Subject: Fix a regression introduced by removing unnecessary db call when replacing When replacing a has_many association with the same one, there is nothing to do with database but a setter method should still return the substituted value for backward compatibility. --- activerecord/lib/active_record/associations/collection_association.rb | 2 ++ activerecord/test/cases/associations/has_many_associations_test.rb | 2 ++ 2 files changed, 4 insertions(+) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 88531205a1..6caadb4ce8 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -370,6 +370,8 @@ module ActiveRecord replace_common_records_in_memory(other_array, original_target) if other_array != original_target transaction { replace_records(other_array, original_target) } + else + other_array end end end diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb index 290b2a0d6b..171cfbde44 100644 --- a/activerecord/test/cases/associations/has_many_associations_test.rb +++ b/activerecord/test/cases/associations/has_many_associations_test.rb @@ -1503,6 +1503,8 @@ class HasManyAssociationsTest < ActiveRecord::TestCase assert_queries(0, ignore_none: true) do firm.clients = [] end + + assert_equal [], firm.send('clients=', []) end def test_transactions_when_replacing_on_persisted -- cgit v1.2.3