diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-04 11:10:47 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-04 11:10:47 -0200 |
commit | c294055a58d125ff719ae17f03015c71790f0df0 (patch) | |
tree | b7f7d720d28c1a3d04fb35fd101ae76611b1beeb /activerecord/lib | |
parent | d261c5cc28d35ae3d493c42edd20d362b61556dc (diff) | |
parent | e9bf87f08e77a457e1b82c2409abcaf4aef5f97c (diff) | |
download | rails-c294055a58d125ff719ae17f03015c71790f0df0.tar.gz rails-c294055a58d125ff719ae17f03015c71790f0df0.tar.bz2 rails-c294055a58d125ff719ae17f03015c71790f0df0.zip |
Merge pull request #12403 from thedarkone/attr-method-missing-fix
Fix AR#method_missing re-dispatching into overwritten attribute methods
Conflicts:
activerecord/lib/active_record/attribute_methods.rb
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index 3924eec872..217fc52dd5 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -128,6 +128,16 @@ module ActiveRecord end end + def find_generated_attribute_method(method_name) # :nodoc: + klass = self + until klass == Base + gen_methods = klass.generated_attribute_methods + return gen_methods.instance_method(method_name) if method_defined_within?(method_name, gen_methods, Object) + klass = klass.superclass + end + nil + end + # Returns +true+ if +attribute+ is an attribute method and table exists, # +false+ otherwise. # @@ -163,7 +173,14 @@ module ActiveRecord def method_missing(method, *args, &block) # :nodoc: self.class.define_attribute_methods if respond_to_without_attributes?(method) - send(method, *args, &block) + # make sure to invoke the correct attribute method, as we might have gotten here via a `super` + # call in a overwritten attribute method + if attribute_method = self.class.find_generated_attribute_method(method) + # this is probably horribly slow, but should only happen at most once for a given AR class + attribute_method.bind(self).call(*args, &block) + else + send(method, *args, &block) + end else super end |