Browse files

Fix situation where id method didn't get defined causing postgres to …

…fail
  • Loading branch information...
1 parent 4a86708 commit 0a2e37975d15310fab01b55a1e3858f137dcd685 @jonleighton jonleighton committed Dec 23, 2011
Showing with 3 additions and 4 deletions.
  1. +3 −4 activerecord/lib/active_record/attribute_methods.rb
View
7 activerecord/lib/active_record/attribute_methods.rb
@@ -65,7 +65,9 @@ def instance_method_already_implemented?(method_name)
if superclass == Base
super
else
- method_defined_within?(method_name, superclass, superclass.generated_attribute_methods) || super
+ # If B < A and A defines its own attribute method, then we don't want to overwrite that.
+ defined = method_defined_within?(method_name, superclass, superclass.generated_attribute_methods)
+ defined && !ActiveRecord::Base.method_defined?(method_name) || super
end
end
@@ -75,9 +77,6 @@ def dangerous_attribute_method?(name)
method_defined_within?(name, Base)
end
- # Note that we could do this via klass.instance_methods(false), but this would require us
- # to maintain a cached Set (for speed) and invalidate it at the correct time, which would
- # be a pain. This implementation is also O(1) while avoiding maintaining a cached Set.
def method_defined_within?(name, klass, sup = klass.superclass)
if klass.method_defined?(name) || klass.private_method_defined?(name)
if sup.method_defined?(name) || sup.private_method_defined?(name)

0 comments on commit 0a2e379

Please sign in to comment.