aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-04 18:20:51 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-04 18:20:51 -0300
commit7922ccb26189baec36f2523e034fec1560a69b03 (patch)
tree68e5aa859e02425a8f08339051078da788d64b1b /activerecord/test
parentaf6816110afc4be56f423cbe51e69891a42df65e (diff)
parent12ff63b227e7ef01c7e57302c9999151dca157f1 (diff)
downloadrails-7922ccb26189baec36f2523e034fec1560a69b03.tar.gz
rails-7922ccb26189baec36f2523e034fec1560a69b03.tar.bz2
rails-7922ccb26189baec36f2523e034fec1560a69b03.zip
Merge pull request #14946 from jcoleman/fix-null-binary-column-logging-exception
Fix exception when logging SQL w/ nil binary value. Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/log_subscriber_test.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
index 97c0350911..a578e81844 100644
--- a/activerecord/test/cases/log_subscriber_test.rb
+++ b/activerecord/test/cases/log_subscriber_test.rb
@@ -125,5 +125,12 @@ class LogSubscriberTest < ActiveRecord::TestCase
wait
assert_match(/<16 bytes of binary data>/, @logger.logged(:debug).join)
end
+
+ def test_nil_binary_data_is_logged
+ binary = Binary.create(data: "")
+ binary.update_attributes(data: nil)
+ wait
+ assert_match(/<NULL binary data>/, @logger.logged(:debug).join)
+ end
end
end