1 files changed, 17 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
index 143d7d9574..c18caa2a2f 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
@@ -10,6 +10,12 @@ module ActiveRecord
         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 = column.cast_type.type_cast_for_database(value)
         end
 
@@ -90,6 +96,16 @@ module ActiveRecord
         value.to_s(:db)
       end
 
+      def prepare_binds_for_database(binds) # :nodoc:
+        binds.map do |column, value|
+          if column
+            column_name = column.name
+            value = column.cast_type.type_cast_for_database(value)
+          end
+          [column_name, value]
+        end
+      end
+
       private
 
       def types_which_need_no_typecasting
@@ -109,8 +125,7 @@ module ActiveRecord
         when Date, Time then "'#{quoted_date(value)}'"
         when Symbol     then "'#{quote_string(value.to_s)}'"
         when Class      then "'#{value}'"
-        else
-          "'#{quote_string(YAML.dump(value))}'"
+        else raise TypeError, "can't quote #{value.class.name}"
         end
       end