Merge pull request #24958 from maclover7/fix-24955

Fix ActiveRecord::LogSubscriber edge case
rails · May 21, 2016 · 3e54c1c · 3e54c1c
2 parents e3b239c + c650341
commit 3e54c1c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
@@ -22,7 +22,11 @@ def initialize
 
     def render_bind(attribute)
       value = if attribute.type.binary? && attribute.value
-        "<#{attribute.value.bytesize} bytes of binary data>"
+        if attribute.value.is_a?(Hash)
+          "<#{attribute.value_for_database.to_s.bytesize} bytes of binary data>"
+        else
+          "<#{attribute.value.bytesize} bytes of binary data>"
+        end
       else
         attribute.value_for_database
       end

diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
@@ -215,5 +215,11 @@ def test_binary_data_is_not_logged
       wait
       assert_match(/<16 bytes of binary data>/, @logger.logged(:debug).join)
     end
+
+    def test_binary_data_hash
+      Binary.create(data: { a: 1 })
+      wait
+      assert_match(/<7 bytes of binary data>/, @logger.logged(:debug).join)
+    end
   end
 end