1 files changed, 9 insertions, 24 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index 74a4d515c2..8cdb508c43 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -31,6 +31,9 @@ module ActiveRecord
       def initialize(klass, association) #:nodoc:
         @association = association
         super klass, klass.arel_table, klass.predicate_builder
+
+        extensions = association.extensions
+        extend(*extensions) if extensions.any?
       end
 
       def target
@@ -1084,9 +1087,8 @@ module ActiveRecord
       #   person.pets(true)  # fetches pets from the database
       #   # => [#<Pet id: 1, name: "Snoop", group: "dogs", person_id: 1>]
       def reload
-        @scope = nil
         proxy_association.reload
-        self
+        reset_scope
       end
 
       # Unloads the association. Returns +self+.
@@ -1106,9 +1108,13 @@ module ActiveRecord
       #   person.pets  # fetches pets from the database
       #   # => [#<Pet id: 1, name: "Snoop", group: "dogs", person_id: 1>]
       def reset
-        @scope = nil
         proxy_association.reset
         proxy_association.reset_scope
+        reset_scope
+      end
+
+      def reset_scope # :nodoc:
+        @scope = nil
         self
       end
 
@@ -1121,19 +1127,6 @@ module ActiveRecord
 
       delegate(*delegate_methods, to: :scope)
 
-      module DelegateExtending # :nodoc:
-        private
-          def method_missing(method, *args, &block)
-            extending_values = association_scope.extending_values
-            if extending_values.any? && (extending_values - self.class.included_modules).any?
-              self.class.include(*extending_values)
-              public_send(method, *args, &block)
-            else
-              super
-            end
-          end
-      end
-
       private
 
         def find_nth_with_limit(index, limit)
@@ -1154,17 +1147,9 @@ module ActiveRecord
           @association.find_from_target?
         end
 
-        def association_scope
-          @association.association_scope
-        end
-
         def exec_queries
           load_target
         end
-
-        def respond_to_missing?(method, _)
-          association_scope.respond_to?(method) || super
-        end
     end
   end
 end