TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Implementing @dmathieu's cleaner fix from #1425. Unfortunately he deleted the branch so I cannot just merge it.

Browse Source
This commit is contained in:
Jon Leighton 2011-05-31 18:34:27 +01:00
parent 0bb8429e71
commit 60cb96abea
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
activerecord/lib/active_record/associations/collection_association.rb
View File

@ -402,16 +402,13 @@ def merge_target_lists(persisted, memory)
return memory if persisted.empty?
persisted.map! do |record|
# Unfortunately we cannot simply do memory.delete(record) since on 1.8 this returns
# record rather than memory.at(memory.index(record)). The behaviour is fixed in 1.9.
mem_index = memory.index(record)
# To work with ruby 1.8.7
# > 1.9 #=> mem_record = memory.delete(record)
mem_record_index = memory.index(record)
if mem_record_index
mem_record = memory.at(mem_record_index)
memory.delete_at(mem_record_index)
end
if mem_index
mem_record = memory.delete_at(mem_index)
if mem_record
(record.attribute_names - mem_record.changes.keys).each do |name|
mem_record[name] = record[name]
end