Remove deprecated support to passing a column to #quote

14 files changed, 38 insertions, 44 deletions

diff --git a/Gemfile b/Gemfile
index e1e892c7f3..f529677fbb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,8 @@ end
 
 gemspec
 
+gem "arel", github: "rails/arel"
+
 # We need a newish Rake since Active Job sets its test tasks' descriptions.
 gem "rake", ">= 11.1"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f6b8001ec..f256186e29 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,6 +39,12 @@ GIT
       websocket
 
 GIT
+  remote: https://github.com/rails/arel.git
+  revision: b26638ef041953992010590b31615c519fa0ea7d
+  specs:
+    arel (8.0.0)
+
+GIT
   remote: https://github.com/resque/resque.git
   revision: 835a4a7e61a2e33832dbf11975ecfab54af293c6
   specs:
@@ -83,7 +89,7 @@ PATH
     activerecord (5.1.0.alpha)
       activemodel (= 5.1.0.alpha)
       activesupport (= 5.1.0.alpha)
-      arel (~> 7.0)
+      arel (~> 8.0)
     activesupport (5.1.0.alpha)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
@@ -114,7 +120,6 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     amq-protocol (2.0.1)
-    arel (7.1.4)
     ast (2.3.0)
     backburner (1.3.1)
       beaneater (~> 1.0)
@@ -193,6 +198,8 @@ GEM
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     ffi (1.9.14)
+    ffi (1.9.14-x64-mingw32)
+    ffi (1.9.14-x86-mingw32)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     hiredis (0.6.1)
@@ -373,6 +380,7 @@ DEPENDENCIES
   activerecord-jdbcmysql-adapter (>= 1.3.0)
   activerecord-jdbcpostgresql-adapter (>= 1.3.0)
   activerecord-jdbcsqlite3-adapter (>= 1.3.0)
+  arel!
   backburner
   bcrypt (~> 3.1.11)
   benchmark-ips
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
diff --git a/guides/bug_report_templates/action_controller_master.rb b/guides/bug_report_templates/action_controller_master.rb
index 486c7243ad..7644f6fe4a 100644
--- a/guides/bug_report_templates/action_controller_master.rb
+++ b/guides/bug_report_templates/action_controller_master.rb
@@ -8,6 +8,7 @@ end
 gemfile(true) do
   source "https://rubygems.org"
   gem "rails", github: "rails/rails"
+  gem "arel", github: "rails/arel"
 end
 
 require "action_controller/railtie"
diff --git a/guides/bug_report_templates/active_job_master.rb b/guides/bug_report_templates/active_job_master.rb
index f61518713f..7591470440 100644
--- a/guides/bug_report_templates/active_job_master.rb
+++ b/guides/bug_report_templates/active_job_master.rb
@@ -8,6 +8,7 @@ end
 gemfile(true) do
   source "https://rubygems.org"
   gem "rails", github: "rails/rails"
+  gem "arel", github: "rails/arel"
 end
 
 require "active_job"
diff --git a/guides/bug_report_templates/active_record_master.rb b/guides/bug_report_templates/active_record_master.rb
index 7265a671b0..8bbc1ef19e 100644
--- a/guides/bug_report_templates/active_record_master.rb
+++ b/guides/bug_report_templates/active_record_master.rb
@@ -8,6 +8,7 @@ end
 gemfile(true) do
   source "https://rubygems.org"
   gem "rails", github: "rails/rails"
+  gem "arel", github: "rails/arel"
   gem "sqlite3"
 end
 
diff --git a/guides/bug_report_templates/active_record_migrations_master.rb b/guides/bug_report_templates/active_record_migrations_master.rb
index 13a375d1ba..84a4b71909 100644
--- a/guides/bug_report_templates/active_record_migrations_master.rb
+++ b/guides/bug_report_templates/active_record_migrations_master.rb
@@ -8,6 +8,7 @@ end
 gemfile(true) do
   source "https://rubygems.org"
   gem "rails", github: "rails/rails"
+  gem "arel", github: "rails/arel"
   gem "sqlite3"
 end
 
diff --git a/guides/bug_report_templates/benchmark.rb b/guides/bug_report_templates/benchmark.rb
index 54433b34dd..a0b541d012 100644
--- a/guides/bug_report_templates/benchmark.rb
+++ b/guides/bug_report_templates/benchmark.rb
@@ -8,6 +8,7 @@ end
 gemfile(true) do
   source "https://rubygems.org"
   gem "rails", github: "rails/rails"
+  gem "arel", github: "rails/arel"
   gem "benchmark-ips"
 end
 
diff --git a/guides/bug_report_templates/generic_master.rb b/guides/bug_report_templates/generic_master.rb
index d3a7ae4ac4..ed45726e92 100644
--- a/guides/bug_report_templates/generic_master.rb
+++ b/guides/bug_report_templates/generic_master.rb
@@ -8,6 +8,7 @@ end
 gemfile(true) do
   source "https://rubygems.org"
   gem "rails", github: "rails/rails"
+  gem "arel", github: "rails/arel"
 end
 
 require "active_support"
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 5c809807a1..66e2804a67 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -246,6 +246,7 @@ module Rails
 
       def rails_gemfile_entry
         dev_edge_common = [
+          GemfileEntry.github("arel", "rails/arel")
         ]
         if options.dev?
           [
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb
index 0bbd25db2b..f62313f3e1 100644
--- a/railties/test/application/bin_setup_test.rb
+++ b/railties/test/application/bin_setup_test.rb
@@ -6,17 +6,10 @@ module ApplicationTests
 
     def setup
       build_app
-
-      create_gemfile
-      update_boot_file_to_use_bundler
-      @old_gemfile_env = ENV["BUNDLE_GEMFILE"]
-      ENV["BUNDLE_GEMFILE"] = app_path + "/Gemfile"
     end
 
     def teardown
       teardown_app
-
-      ENV["BUNDLE_GEMFILE"] = @old_gemfile_env
     end
 
     def test_bin_setup
@@ -47,6 +40,7 @@ module ApplicationTests
         output = `bin/setup 2>&1`
         assert_equal(<<-OUTPUT, output)
 == Installing dependencies ==
+Resolving dependencies...
 The Gemfile's dependencies are satisfied
 
 == Preparing database ==
@@ -59,16 +53,5 @@ Created database 'db/test.sqlite3'
         OUTPUT
       end
     end
-
-    private
-      def create_gemfile
-        app_file("Gemfile", "source 'https://rubygems.org'")
-        app_file("Gemfile", "gem 'rails', path: '#{RAILS_FRAMEWORK_ROOT}'", "a")
-        app_file("Gemfile", "gem 'sqlite3'", "a")
-      end
-
-      def update_boot_file_to_use_bundler
-        app_file("config/boot.rb", "require 'bundler/setup'")
-      end
   end
 end