diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb
index 79af51bdba..36e2134c46 100644
--- a/activerecord/lib/active_record/querying.rb
+++ b/activerecord/lib/active_record/querying.rb
@@ -2,19 +2,23 @@
 
 module ActiveRecord
   module Querying
-    delegate :find, :take, :take!, :first, :first!, :last, :last!, :exists?, :any?, :many?, :none?, :one?, to: :all
-    delegate :second, :second!, :third, :third!, :fourth, :fourth!, :fifth, :fifth!, :forty_two, :forty_two!, :third_to_last, :third_to_last!, :second_to_last, :second_to_last!, to: :all
-    delegate :first_or_create, :first_or_create!, :first_or_initialize, to: :all
-    delegate :find_or_create_by, :find_or_create_by!, :create_or_find_by, :create_or_find_by!, :find_or_initialize_by, to: :all
-    delegate :find_by, :find_by!, to: :all
-    delegate :destroy_all, :delete_all, :update_all, :destroy_by, :delete_by, to: :all
-    delegate :find_each, :find_in_batches, :in_batches, to: :all
-    delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins, :left_joins, :left_outer_joins, :or,
-             :where, :rewhere, :preload, :eager_load, :includes, :from, :lock, :readonly, :extending,
-             :having, :create_with, :distinct, :references, :none, :unscope, :merge,
-             :reselect, to: :all
-    delegate :count, :average, :minimum, :maximum, :sum, :calculate, to: :all
-    delegate :pluck, :pick, :ids, to: :all
+    QUERYING_METHODS = [
+      :find, :find_by, :find_by!, :take, :take!, :first, :first!, :last, :last!,
+      :second, :second!, :third, :third!, :fourth, :fourth!, :fifth, :fifth!,
+      :forty_two, :forty_two!, :third_to_last, :third_to_last!, :second_to_last, :second_to_last!,
+      :exists?, :any?, :many?, :none?, :one?,
+      :first_or_create, :first_or_create!, :first_or_initialize,
+      :find_or_create_by, :find_or_create_by!, :find_or_initialize_by,
+      :create_or_find_by, :create_or_find_by!,
+      :destroy_all, :delete_all, :update_all, :destroy_by, :delete_by,
+      :find_each, :find_in_batches, :in_batches,
+      :select, :reselect, :order, :reorder, :group, :limit, :offset, :joins, :left_joins, :left_outer_joins,
+      :where, :rewhere, :preload, :eager_load, :includes, :from, :lock, :readonly, :extending, :or,
+      :having, :create_with, :distinct, :references, :none, :unscope, :merge, :except,
+      :count, :average, :minimum, :maximum, :sum, :calculate,
+      :pluck, :pick, :ids
+    ].freeze # :nodoc:
+    delegate(*QUERYING_METHODS, to: :all)
 
     # Executes a custom SQL query against your database and returns all the results. The results will
     # be returned as an array, with the requested columns encapsulated as attributes of the model you call
diff --git a/activerecord/test/cases/relation/delegation_test.rb b/activerecord/test/cases/relation/delegation_test.rb
index 31e7a4b8f4..d04c409cb5 100644
--- a/activerecord/test/cases/relation/delegation_test.rb
+++ b/activerecord/test/cases/relation/delegation_test.rb
@@ -44,26 +44,28 @@ module ActiveRecord
   end
 
   class QueryingMethodsDelegationTest < ActiveRecord::TestCase
-    QUERYING_METHODS = [
-      :find, :take, :take!, :first, :first!, :last, :last!, :exists?, :any?, :many?, :none?, :one?,
-      :second, :second!, :third, :third!, :fourth, :fourth!, :fifth, :fifth!, :forty_two, :forty_two!, :third_to_last, :third_to_last!, :second_to_last, :second_to_last!,
-      :first_or_create, :first_or_create!, :first_or_initialize,
-      :find_or_create_by, :find_or_create_by!, :create_or_find_by, :create_or_find_by!, :find_or_initialize_by,
-      :find_by, :find_by!,
-      :destroy_all, :delete_all, :update_all, :delete_by, :destroy_by,
-      :find_each, :find_in_batches, :in_batches,
-      :select, :group, :order, :except, :reorder, :limit, :offset, :joins, :left_joins, :left_outer_joins, :or,
-      :where, :rewhere, :preload, :eager_load, :includes, :from, :lock, :readonly, :extending,
-      :having, :create_with, :distinct, :references, :none, :unscope, :merge,
-      :count, :average, :minimum, :maximum, :sum, :calculate,
-      :pluck, :pick, :ids, :reselect,
-    ]
+    QUERYING_METHODS =
+      ActiveRecord::Batches.public_instance_methods(false) +
+      ActiveRecord::Calculations.public_instance_methods(false) +
+      ActiveRecord::FinderMethods.public_instance_methods(false) - [:raise_record_not_found_exception!] +
+      ActiveRecord::SpawnMethods.public_instance_methods(false) - [:spawn, :merge!, :only] +
+      ActiveRecord::QueryMethods.public_instance_methods(false).reject { |method|
+        method.to_s.end_with?("=", "!", "value", "values", "clause")
+      } - [:reverse_order, :arel, :extensions] + [
+        :any?, :many?, :none?, :one?,
+        :first_or_create, :first_or_create!, :first_or_initialize,
+        :find_or_create_by, :find_or_create_by!, :find_or_initialize_by,
+        :create_or_find_by, :create_or_find_by!,
+        :destroy_all, :delete_all, :update_all, :delete_by, :destroy_by
+      ]
 
     def test_delegate_querying_methods
       klass = Class.new(ActiveRecord::Base) do
         self.table_name = "posts"
       end
 
+      assert_equal QUERYING_METHODS.sort, ActiveRecord::Querying::QUERYING_METHODS.sort
+
       QUERYING_METHODS.each do |method|
         assert_respond_to klass.all, method
         assert_respond_to klass, method