Merge pull request #29619 from kamipo/deprecate_delegating_to_arel_in…

…_relation Deprecate delegating to `arel` in `Relation`
rails · Jun 29, 2017 · a317af9 · a317af9
2 parents 4448873 + d9fca84
commit a317af9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Deprecate delegating to `arel` in `Relation`.
+
+    *Ryuta Kamizono*
+
 *   Fix eager loading to respect `store_full_sti_class` setting.
 
     *Ryuta Kamizono*

diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb
@@ -89,6 +89,8 @@ def method_missing(method, *args, &block)
             self.class.delegate_to_scoped_klass(method)
             scoping { @klass.public_send(method, *args, &block) }
           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

diff --git a/activerecord/test/cases/relation/delegation_test.rb b/activerecord/test/cases/relation/delegation_test.rb
@@ -21,8 +21,22 @@ module DelegationWhitelistTests
     end
   end
 
+  module DeprecatedArelDelegationTests
+    AREL_METHODS = [
+      :with, :orders, :froms, :project, :projections, :taken, :constraints, :exists, :locked, :where_sql,
+      :ast, :source, :join_sources, :to_dot, :bind_values, :create_insert, :create_true, :create_false
+    ]
+
+    def test_deprecate_arel_delegation
+      AREL_METHODS.each do |method|
+        assert_deprecated { target.public_send(method) }
+      end
+    end
+  end
+
   class DelegationAssociationTest < ActiveRecord::TestCase
     include DelegationWhitelistTests
+    include DeprecatedArelDelegationTests
 
     fixtures :posts
 
@@ -33,6 +47,7 @@ def target
 
   class DelegationRelationTest < ActiveRecord::TestCase
     include DelegationWhitelistTests
+    include DeprecatedArelDelegationTests
 
     fixtures :comments