aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorSean Griffin <sean@thoughtbot.com>2015-01-10 12:24:10 -0700
committerSean Griffin <sean@thoughtbot.com>2015-01-10 12:26:51 -0700
commit7a09fc55c0d89f6a672c79fdd9787c51a85a06fc (patch)
tree9fd483146de0f535845889d7eb917e287f42df36 /activerecord/lib/active_record
parent4d5e6607899832bde1365bdd4f7617a24bca4561 (diff)
downloadrails-7a09fc55c0d89f6a672c79fdd9787c51a85a06fc.tar.gz
rails-7a09fc55c0d89f6a672c79fdd9787c51a85a06fc.tar.bz2
rails-7a09fc55c0d89f6a672c79fdd9787c51a85a06fc.zip
Stop special casing null binary data in logging
There's very little value in logging "<NULL binary data>" instead of just "nil". I'd like to remove the column from the equation entirely, and this case is preventing us from doing so.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/log_subscriber.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
index eb64d197f0..a5c7279db9 100644
--- a/activerecord/lib/active_record/log_subscriber.rb
+++ b/activerecord/lib/active_record/log_subscriber.rb
@@ -22,10 +22,10 @@ module ActiveRecord
def render_bind(column, value)
if column
- if column.binary?
+ if column.binary? && value
# This specifically deals with the PG adapter that casts bytea columns into a Hash.
value = value[:value] if value.is_a?(Hash)
- value = value ? "<#{value.bytesize} bytes of binary data>" : "<NULL binary data>"
+ value = "<#{value.bytesize} bytes of binary data>"
end
[column.name, value]