From e646bad5b7c462187fc75c11d5c06e43759022d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Thu, 29 Dec 2016 02:20:50 -0500
Subject: Remove deprecated support to passing a column to #quote

---
 activerecord/CHANGELOG.md                          |  4 ++++
 activerecord/activerecord.gemspec                  |  2 +-
 .../connection_adapters/abstract/quoting.rb        | 12 +----------
 activerecord/test/cases/quoting_test.rb            | 24 +++++++++++-----------
 4 files changed, 18 insertions(+), 24 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 7774c6088f..a9e9f34590 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Remove deprecated support to passing a column to `#quote`.
+
+    *Rafael Mendonça França*
+
 *   Set `:time` as a timezone aware type and remove deprecation when the values is not
     explictly set.
 
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index 2cd8f179dd..0b37e9076c 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport", version
   s.add_dependency "activemodel",   version
 
-  s.add_dependency "arel", "~> 7.0"
+  s.add_dependency "arel", "~> 8.0"
 end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index bbd52b8a91..0c6bc16e6f 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -5,20 +5,10 @@ module ActiveRecord
     module Quoting
       # Quotes the column value to help prevent
       # {SQL injection attacks}[http://en.wikipedia.org/wiki/SQL_injection].
-      def quote(value, column = nil)
+      def quote(value)
         # records are quoted as their primary key
         return value.quoted_id if value.respond_to?(:quoted_id)
 
-        if column
-          ActiveSupport::Deprecation.warn(<<-MSG.squish)
-            Passing a column to `quote` has been deprecated. It is only used
-            for type casting, which should be handled elsewhere. See
-            https://github.com/rails/arel/commit/6160bfbda1d1781c3b08a33ec4955f170e95be11
-            for more information.
-          MSG
-          value = type_cast_from_column(column, value)
-        end
-
         _quote(value)
       end
 
diff --git a/activerecord/test/cases/quoting_test.rb b/activerecord/test/cases/quoting_test.rb
index 05b71638c1..5ff5e3c735 100644
--- a/activerecord/test/cases/quoting_test.rb
+++ b/activerecord/test/cases/quoting_test.rb
@@ -82,46 +82,46 @@ module ActiveRecord
       end
 
       def test_quote_with_quoted_id
-        assert_equal 1, @quoter.quote(Struct.new(:quoted_id).new(1), nil)
+        assert_equal 1, @quoter.quote(Struct.new(:quoted_id).new(1))
       end
 
       def test_quote_nil
-        assert_equal "NULL", @quoter.quote(nil, nil)
+        assert_equal "NULL", @quoter.quote(nil)
       end
 
       def test_quote_true
-        assert_equal @quoter.quoted_true, @quoter.quote(true, nil)
+        assert_equal @quoter.quoted_true, @quoter.quote(true)
       end
 
       def test_quote_false
-        assert_equal @quoter.quoted_false, @quoter.quote(false, nil)
+        assert_equal @quoter.quoted_false, @quoter.quote(false)
       end
 
       def test_quote_float
         float = 1.2
-        assert_equal float.to_s, @quoter.quote(float, nil)
+        assert_equal float.to_s, @quoter.quote(float)
       end
 
       def test_quote_integer
         integer = 1
-        assert_equal integer.to_s, @quoter.quote(integer, nil)
+        assert_equal integer.to_s, @quoter.quote(integer)
       end
 
       def test_quote_bignum
         bignum = 1 << 100
-        assert_equal bignum.to_s, @quoter.quote(bignum, nil)
+        assert_equal bignum.to_s, @quoter.quote(bignum)
       end
 
       def test_quote_bigdecimal
         bigdec = BigDecimal.new((1 << 100).to_s)
-        assert_equal bigdec.to_s("F"), @quoter.quote(bigdec, nil)
+        assert_equal bigdec.to_s("F"), @quoter.quote(bigdec)
       end
 
       def test_dates_and_times
         @quoter.extend(Module.new { def quoted_date(value) "lol" end })
-        assert_equal "'lol'", @quoter.quote(Date.today, nil)
-        assert_equal "'lol'", @quoter.quote(Time.now, nil)
-        assert_equal "'lol'", @quoter.quote(DateTime.now, nil)
+        assert_equal "'lol'", @quoter.quote(Date.today)
+        assert_equal "'lol'", @quoter.quote(Time.now)
+        assert_equal "'lol'", @quoter.quote(DateTime.now)
       end
 
       def test_quoting_classes
@@ -131,7 +131,7 @@ module ActiveRecord
       def test_crazy_object
         crazy = Object.new
         e = assert_raises(TypeError) do
-          @quoter.quote(crazy, nil)
+          @quoter.quote(crazy)
         end
         assert_equal "can't quote Object", e.message
       end
-- 
cgit v1.2.3