Fix nested attribute for memory record.

arunagw · May 31, 2011 · cfb5f1b · cfb5f1b
1 parent 7278547
commit cfb5f1b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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|