1 files changed, 5 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb
index cab8fd745a..bc78c3858a 100644
--- a/activerecord/lib/active_record/sanitization.rb
+++ b/activerecord/lib/active_record/sanitization.rb
@@ -101,7 +101,7 @@ module ActiveRecord
       #     # => "status = NULL , group_id = 1"
       def sanitize_sql_hash_for_assignment(attrs, table)
         attrs.map do |attr, value|
-          "#{connection.quote_table_name_for_assignment(table, attr)} = #{quote_bound_value(value)}"
+          "#{connection.quote_table_name_for_assignment(table, attr)} = #{quote_bound_value(value, connection, columns_hash[attr.to_s])}"
         end.join(', ')
       end
 
@@ -152,15 +152,16 @@ module ActiveRecord
         end
       end
 
-      def quote_bound_value(value, c = connection) #:nodoc:
-        if value.respond_to?(:map) && !value.acts_like?(:string)
+      def quote_bound_value(value, c = connection, column = nil) #:nodoc:
+        db_native_type = column && (column.respond_to?(:array) && column.array || [:json, :hstore].include?(column.type) )
+        if value.respond_to?(:map) && !value.acts_like?(:string) && !db_native_type
           if value.respond_to?(:empty?) && value.empty?
             c.quote(nil)
           else
             value.map { |v| c.quote(v) }.join(',')
           end
         else
-          c.quote(value)
+          c.quote(value, column)
         end
       end