Should be appear deprecation message for every call (#29649)

Context: https://github.com/rails/rails/pull/29619#discussion_r125158589

2 files changed, 1 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb
index 4793f2a49b..1aa85993ca 100644
--- a/activerecord/lib/active_record/relation/delegation.rb
+++ b/activerecord/lib/active_record/relation/delegation.rb
@@ -75,13 +75,6 @@ module ActiveRecord
             end
           end
         end
-
-        def delegate(method, opts = {})
-          @delegation_mutex.synchronize do
-            return if method_defined?(method)
-            super
-          end
-        end
       end
 
       private
@@ -93,7 +86,6 @@ module ActiveRecord
           elsif arel.respond_to?(method)
             ActiveSupport::Deprecation.warn \
               "Delegating #{method} to arel is deprecated and will be removed in Rails 6.0."
-            self.class.delegate method, to: :arel
             arel.public_send(method, *args, &block)
           else
             super
diff --git a/activerecord/test/cases/relation/delegation_test.rb b/activerecord/test/cases/relation/delegation_test.rb
index 8ffb9f163b..04d688ac53 100644
--- a/activerecord/test/cases/relation/delegation_test.rb
+++ b/activerecord/test/cases/relation/delegation_test.rb
@@ -32,6 +32,7 @@ module ActiveRecord
     def test_deprecate_arel_delegation
       AREL_METHODS.each do |method|
         assert_deprecated { target.public_send(method) }
+        assert_deprecated { target.public_send(method) }
       end
     end
   end