aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/attribute_methods/primary_key.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-12-14 14:49:02 +0000
committerJon Leighton <j@jonathanleighton.com>2011-12-14 14:51:57 +0000
commitbb44e5a80ac62f87a40122a213038a746f2bc289 (patch)
treefd897babdffa9e8e5a08d5dd45bfdea0b5f58078 /activerecord/lib/active_record/attribute_methods/primary_key.rb
parenta5589db063e0f527357f6be338adecf4716e6b47 (diff)
downloadrails-bb44e5a80ac62f87a40122a213038a746f2bc289.tar.gz
rails-bb44e5a80ac62f87a40122a213038a746f2bc289.tar.bz2
rails-bb44e5a80ac62f87a40122a213038a746f2bc289.zip
Use a separate module for 'external' attribute methods.
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/primary_key.rb')
-rw-r--r--activerecord/lib/active_record/attribute_methods/primary_key.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb
index 746682393e..e3c7344f59 100644
--- a/activerecord/lib/active_record/attribute_methods/primary_key.rb
+++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb
@@ -30,10 +30,10 @@ module ActiveRecord
if attr_name == primary_key && attr_name != 'id'
generated_attribute_methods.send(:alias_method, :id, primary_key)
- generated_attribute_methods.module_eval <<-CODE, __FILE__, __LINE__
- def self.attribute_id(v, attributes, attributes_cache, attr_name)
+ generated_external_attribute_methods.module_eval <<-CODE, __FILE__, __LINE__
+ def id(v, attributes, attributes_cache, attr_name)
attr_name = '#{primary_key}'
- send(:'attribute_#{attr_name}', attributes[attr_name], attributes, attributes_cache, attr_name)
+ send(attr_name, attributes[attr_name], attributes, attributes_cache, attr_name)
end
CODE
end