From 8e6ef92fd9ede38aa435afeaef6370ff65191a0b Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 14 Feb 2014 14:20:07 -0800 Subject: pass the association and connection to the scope method --- activerecord/lib/active_record/associations/association.rb | 2 +- .../lib/active_record/associations/association_scope.rb | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'activerecord/lib/active_record/associations') diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb index 67ea489b22..2dba33898c 100644 --- a/activerecord/lib/active_record/associations/association.rb +++ b/activerecord/lib/active_record/associations/association.rb @@ -94,7 +94,7 @@ module ActiveRecord # actually gets built. def association_scope if klass - @association_scope ||= AssociationScope.new(self).scope + @association_scope ||= AssociationScope.new.scope(self, klass.connection) end end diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb index 1f094d42b3..cd2911e0a4 100644 --- a/activerecord/lib/active_record/associations/association_scope.rb +++ b/activerecord/lib/active_record/associations/association_scope.rb @@ -1,18 +1,12 @@ module ActiveRecord module Associations class AssociationScope #:nodoc: - attr_reader :association - - def initialize(association) - @association = association - end - - def scope + def scope(association, connection) klass = association.klass reflection = association.reflection scope = klass.unscoped owner = association.owner - alias_tracker = AliasTracker.new klass.connection + alias_tracker = AliasTracker.new connection scope.extending! Array(reflection.options[:extend]) add_constraints(scope, owner, klass, reflection, alias_tracker) -- cgit v1.2.3