diff options
| author | Sergey Nartimov <just.lest@gmail.com> | 2012-02-11 22:03:07 +0300 |
|---|---|---|
| committer | Sergey Nartimov <just.lest@gmail.com> | 2012-02-11 22:03:07 +0300 |
| commit | d7942d4230e7cfa0c0c7c96c9a10dee49f612155 (patch) | |
| tree | ccacb2cb9d1f889e135ac6487fae227f994a266b /activerecord/lib/active_record | |
| parent | 347e0a603308f1936d995ad0e7966e1de071e75f (diff) | |
| download | rails-d7942d4230e7cfa0c0c7c96c9a10dee49f612155.tar.gz rails-d7942d4230e7cfa0c0c7c96c9a10dee49f612155.tar.bz2 rails-d7942d4230e7cfa0c0c7c96c9a10dee49f612155.zip | |
handle id attribute in PrimaryKey module
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/primary_key.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index 889c80386f..3e27e85f02 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -244,7 +244,7 @@ module ActiveRecord end def attribute_method?(attr_name) - attr_name == 'id' || (defined?(@attributes) && @attributes.include?(attr_name)) + defined?(@attributes) && @attributes.include?(attr_name) end end end 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 |