diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-02-11 11:14:00 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-02-11 11:14:00 -0800 |
| commit | 5138a8f254b865c2cf97b61848b640783366d26b (patch) | |
| tree | ccacb2cb9d1f889e135ac6487fae227f994a266b /activerecord/lib/active_record/attribute_methods/primary_key.rb | |
| parent | 347e0a603308f1936d995ad0e7966e1de071e75f (diff) | |
| parent | d7942d4230e7cfa0c0c7c96c9a10dee49f612155 (diff) | |
| download | rails-5138a8f254b865c2cf97b61848b640783366d26b.tar.gz rails-5138a8f254b865c2cf97b61848b640783366d26b.tar.bz2 rails-5138a8f254b865c2cf97b61848b640783366d26b.zip | |
Merge pull request #5006 from lest/patch-1
handle id attribute in PrimaryKey module
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/primary_key.rb')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/primary_key.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb index 7c59664703..2e1a2dc3ef 100644 --- a/activerecord/lib/active_record/attribute_methods/primary_key.rb +++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb @@ -24,6 +24,12 @@ module ActiveRecord query_attribute(self.class.primary_key) end + protected + + def attribute_method?(attr_name) + attr_name == 'id' || super + end + module ClassMethods def define_method_attribute(attr_name) super |