diff options
| author | Shintaro Kojima <goodies@codeout.net> | 2015-04-04 12:24:48 +0000 |
|---|---|---|
| committer | Shintaro Kojima <goodies@codeout.net> | 2015-04-04 12:48:36 +0000 |
| commit | e646d3bf574ad3ea7dc5b525511377559b2640dc (patch) | |
| tree | 3683452896a028a7e3014783b3c9016328a08b5d /activerecord/lib/active_record/associations | |
| parent | 5abadf1613710c6e6b54e8190b66543861711b8a (diff) | |
| download | rails-e646d3bf574ad3ea7dc5b525511377559b2640dc.tar.gz rails-e646d3bf574ad3ea7dc5b525511377559b2640dc.tar.bz2 rails-e646d3bf574ad3ea7dc5b525511377559b2640dc.zip | |
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.
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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 |