Stop passing a column to `quote` when prepared statements are turned off

I'm planning on deprecating the column argument to mirror the
deprecation in [arel].

[arel]: https://github.com/rails/arel/commit/6160bfbda1d1781c3b08a33ec4955f170e95be11

2 files changed, 5 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index fb68ad17b2..1f265a55df 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -90,9 +90,7 @@ module ActiveRecord
         value.to_s(:db)
       end
 
-      private
-
-      def prepare_binds_for_database(binds)
+      def prepare_binds_for_database(binds) # :nodoc:
         binds.map do |column, value|
           if column
             column_name = column.name
@@ -102,6 +100,8 @@ module ActiveRecord
         end
       end
 
+      private
+
       def types_which_need_no_typecasting
         [nil, Numeric, String]
       end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index e52b666296..c941c9f1eb 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -113,7 +113,8 @@ module ActiveRecord
 
       class BindCollector < Arel::Collectors::Bind
         def compile(bvs, conn)
-          super(bvs.map { |bv| conn.quote(*bv.reverse) })
+          casted_binds = conn.prepare_binds_for_database(bvs)
+          super(casted_binds.map { |_, value| conn.quote(value) })
         end
       end