kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

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

Browse source
This commit is contained in:
Jon Leighton 2011-12-23 20:31:24 +00:00
parent a51c4a314f
commit 4d8ee28841
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
activerecord/lib/active_record/attribute_methods.rb
View file

@ -64,7 +64,9 @@ module ActiveRecord
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
@ -74,9 +76,6 @@ module ActiveRecord
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)