1 files changed, 20 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
index ad71c6cde8..4b8d8d9105 100644
--- a/activerecord/lib/active_record/log_subscriber.rb
+++ b/activerecord/lib/active_record/log_subscriber.rb
@@ -15,16 +15,6 @@ module ActiveRecord
       rt
     end
 
-    def render_bind(attr, type_casted_value)
-      value = if attr.type.binary? && attr.value
-        "<#{attr.value_for_database.to_s.bytesize} bytes of binary data>"
-      else
-        type_casted_value
-      end
-
-      [attr.name, value]
-    end
-
     def sql(event)
       self.class.runtime += event.duration
       return unless logger.debug?
@@ -39,7 +29,8 @@ module ActiveRecord
       binds = nil
 
       unless (payload[:binds] || []).empty?
-        binds = "  " + payload[:binds].zip(payload[:type_casted_binds]).map { |attr, value|
+        casted_params = type_casted_binds(payload[:binds], payload[:type_casted_binds])
+        binds = "  " + payload[:binds].zip(casted_params).map { |attr, value|
           render_bind(attr, value)
         }.inspect
       end
@@ -52,6 +43,20 @@ module ActiveRecord
 
     private
 
+      def type_casted_binds(binds, casted_binds)
+        casted_binds || binds.map { |attr| type_cast attr.value_for_database }
+      end
+
+      def render_bind(attr, type_casted_value)
+        value = if attr.type.binary? && attr.value
+          "<#{attr.value_for_database.to_s.bytesize} bytes of binary data>"
+        else
+          type_casted_value
+        end
+
+        [attr.name, value]
+      end
+
       def colorize_payload_name(name, payload_name)
         if payload_name.blank? || payload_name == "SQL" # SQL vs Model Load/Exists
           color(name, MAGENTA, true)
@@ -84,6 +89,10 @@ module ActiveRecord
       def logger
         ActiveRecord::Base.logger
       end
+
+      def type_cast(value)
+        ActiveRecord::Base.connection.type_cast(value)
+      end
   end
 end