Merge pull request #14140 from WojtekKruszewski/optimize_foreign_key_for

Prevent foreign_key_for? from evaluating all attributes
rails · Feb 21, 2014 · 2fdbddd · 2fdbddd
1 parent d094d7e
commit 2fdbddd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb
@@ -232,7 +232,7 @@ def invertible_for?(record)
 
         # Returns true if record contains the foreign_key
         def foreign_key_for?(record)
-          record.attributes.has_key? reflection.foreign_key
+          record.has_attribute?(reflection.foreign_key)
         end
 
         # This should be implemented to return the values of the relevant key(s) on the owner,