aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/attribute_methods/write.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-10-05 01:09:43 +0100
committerJon Leighton <j@jonathanleighton.com>2011-10-05 01:11:40 +0100
commitee2be435b1e5c0e94a4ee93a1a310e0471a77d07 (patch)
treed30036d8c7f8520df4c6cd4c47e0f7733abe3525 /activerecord/lib/active_record/attribute_methods/write.rb
parent5711a35ad8faa3fb6d138b234cbe9acfad27a9a8 (diff)
downloadrails-ee2be435b1e5c0e94a4ee93a1a310e0471a77d07.tar.gz
rails-ee2be435b1e5c0e94a4ee93a1a310e0471a77d07.tar.bz2
rails-ee2be435b1e5c0e94a4ee93a1a310e0471a77d07.zip
Raise error on unknown primary key.
If we don't have a primary key when we ask for it, it's better to fail fast. Fixes GH #2307.
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/write.rb')
-rw-r--r--activerecord/lib/active_record/attribute_methods/write.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/write.rb b/activerecord/lib/active_record/attribute_methods/write.rb
index e9cdb130db..4db6d71ba6 100644
--- a/activerecord/lib/active_record/attribute_methods/write.rb
+++ b/activerecord/lib/active_record/attribute_methods/write.rb
@@ -18,7 +18,7 @@ module ActiveRecord
end
end
- if attr_name == primary_key && attr_name != "id"
+ if primary_key? && attr_name == primary_key && attr_name != "id"
generated_attribute_methods.module_eval("alias :id= :'#{primary_key}='")
end
end