Merge pull request #28828 from kamipo/fix_extending_modules_on_association

Mixin `CollectionProxy::DelegateExtending` after `ClassSpecificRelation`

2 files changed, 20 insertions, 10 deletions

diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index 5d6676f0df..74a4d515c2 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -1121,6 +1121,19 @@ 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)
@@ -1141,21 +1154,16 @@ 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, _)
-          scope.respond_to?(method) || super
-        end
-
-        def method_missing(method, *args, &block)
-          if scope.respond_to?(method) && scope.extending_values.any?
-            extend(*scope.extending_values)
-            public_send(method, *args, &block)
-          else
-            super
-          end
+          association_scope.respond_to?(method) || super
         end
     end
   end
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb
index 8b4dd25689..257ae04ff4 100644
--- a/activerecord/lib/active_record/relation/delegation.rb
+++ b/activerecord/lib/active_record/relation/delegation.rb
@@ -25,6 +25,8 @@ module ActiveRecord
 
       def inherited(child_class)
         child_class.initialize_relation_delegate_cache
+        delegate = child_class.relation_delegate_class(ActiveRecord::Associations::CollectionProxy)
+        delegate.include ActiveRecord::Associations::CollectionProxy::DelegateExtending
         super
       end
     end