diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-04 18:20:51 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-04 18:20:51 -0300 |
| commit | 7922ccb26189baec36f2523e034fec1560a69b03 (patch) | |
| tree | 68e5aa859e02425a8f08339051078da788d64b1b /activerecord/lib | |
| parent | af6816110afc4be56f423cbe51e69891a42df65e (diff) | |
| parent | 12ff63b227e7ef01c7e57302c9999151dca157f1 (diff) | |
| download | rails-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/lib')
| -rw-r--r-- | activerecord/lib/active_record/log_subscriber.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb index 654ef21b07..17d0c52e47 100644 --- a/activerecord/lib/active_record/log_subscriber.rb +++ b/activerecord/lib/active_record/log_subscriber.rb @@ -25,7 +25,7 @@ module ActiveRecord if column.binary? # This specifically deals with the PG adapter that casts bytea columns into a Hash. value = value[:value] if value.is_a?(Hash) - value = "<#{value.bytesize} bytes of binary data>" + value = value.nil? ? "<NULL binary data>" : "<#{value.bytesize} bytes of binary data>" end [column.name, value] |