From ad389286bbce5a43de34dc2df3968fa1f47181e1 Mon Sep 17 00:00:00 2001 From: Rob Looby Date: Fri, 8 May 2015 13:52:33 -0500 Subject: put dynamic matchers on the GeneratedAssociationMethods instead of model --- activerecord/lib/active_record/dynamic_matchers.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/dynamic_matchers.rb b/activerecord/lib/active_record/dynamic_matchers.rb index b6dd6814db..78fac1f3bb 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 - send(name, *arguments, &block) + generated_association_methods.send(name, *arguments, &block) else super end @@ -60,7 +60,7 @@ module ActiveRecord end def define - model.class_eval <<-CODE, __FILE__, __LINE__ + 1 + model.generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1 def self.#{name}(#{signature}) #{body} end @@ -70,7 +70,7 @@ module ActiveRecord private def body - "#{finder}(#{attributes_hash})" + "#{model}.#{finder}(#{attributes_hash})" end # The parameters in the signature may have reserved Ruby words, in order -- cgit v1.2.3