Move #proxy_association method to AssociationRelation

activerecord/lib/active_record/association_relation.rb

@@ -5,6 +5,10 @@ def initialize(klass, table, association)
       @association = association
     end
 
+    def proxy_association
+      @association
+    end
+
     private
 
     def exec_queries

activerecord/lib/active_record/associations/collection_proxy.rb

@@ -847,9 +847,7 @@ def scoping
 
       # Returns a <tt>Relation</tt> object for the records in this association
       def scope
-        @association.scope.tap do |scope|
-          scope.proxy_association = @association
-        end
+        @association.scope
       end
 
       # :nodoc:

activerecord/lib/active_record/relation.rb

@@ -17,7 +17,7 @@ class Relation
     include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches, Explain, Delegation
 
     attr_reader :table, :klass, :loaded
-    attr_accessor :default_scoped, :proxy_association
+    attr_accessor :default_scoped
     alias :model :klass
     alias :loaded? :loaded
     alias :default_scoped? :default_scoped