Fix nested attribute for memory record.

2011-05-31 11:31:10 +05:30 · 2011-05-31 11:31:10 +05:30 · cfb5f1b608
commit cfb5f1b608
parent 7278547a5d
1 changed files with 5 additions and 1 deletions
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@ -402,7 +402,11 @@ def merge_target_lists(persisted, memory)
          return memory    if persisted.empty?

          persisted.map! do |record|
-            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_record
              (record.attribute_names - mem_record.changes.keys).each do |name|