diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-09 06:08:57 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-09 06:08:57 -0300 |
| commit | d9e55535164feb1a0f73a9f64c1055cc67b98121 (patch) | |
| tree | 509cf0f0ae38af6d2d9571728af1c3636a00cb1a /activerecord/lib | |
| parent | d5ba9a42a6e93b163a49f99d739aa56820e044d0 (diff) | |
| download | rails-d9e55535164feb1a0f73a9f64c1055cc67b98121.tar.gz rails-d9e55535164feb1a0f73a9f64c1055cc67b98121.tar.bz2 rails-d9e55535164feb1a0f73a9f64c1055cc67b98121.zip | |
Revert "Merge pull request #20080 from robertjlooby/fix_overwriting_by_dynamic_finders"
This reverts commit d5ba9a42a6e93b163a49f99d739aa56820e044d0, reversing
changes made to 30c503395bf6bf7db1ec0295bd661ce644628db5.
Reason: This generate the dynalic finders more than one time
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/dynamic_matchers.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/dynamic_matchers.rb b/activerecord/lib/active_record/dynamic_matchers.rb index 78fac1f3bb..b6dd6814db 100644 --- a/activerecord/lib/active_record/dynamic_matchers.rb +++ b/activerecord/lib/active_record/dynamic_matchers.rb @@ -16,7 +16,7 @@ module ActiveRecord if match && match.valid? match.define - generated_association_methods.send(name, *arguments, &block) + send(name, *arguments, &block) else super end @@ -60,7 +60,7 @@ module ActiveRecord end def define - model.generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1 + model.class_eval <<-CODE, __FILE__, __LINE__ + 1 def self.#{name}(#{signature}) #{body} end @@ -70,7 +70,7 @@ module ActiveRecord private def body - "#{model}.#{finder}(#{attributes_hash})" + "#{finder}(#{attributes_hash})" end # The parameters in the signature may have reserved Ruby words, in order |