From e1beb7d2878cb55a045731b4a4c0c7a6046b3c09 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 12 Jan 2011 15:15:45 -0800
Subject: use array maths rather than *args

---
 .../lib/active_record/associations/association_collection.rb        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index 6433cc3034..da3800bf4a 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -358,8 +358,10 @@ module ActiveRecord
                     if i
                       @target.delete_at(i).tap do |t|
                         keys = ["id"] + t.changes.keys + (f.attribute_names - t.attribute_names)
-                        f.attributes.except(*keys).each do |k,v|
-                          t.send("#{k}=", v)
+                        # FIXME: this call to attributes causes many NoMethodErrors
+                        attributes = f.attributes
+                        (attributes.keys - keys).each do |k|
+                          t.send("#{k}=", attributes[k])
                         end
                       end
                     else
-- 
cgit v1.2.3