aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-09 09:35:15 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-09 09:35:15 -0200
commit8313f3c5771bfaa3325446d2bbe29c405f8b22c4 (patch)
treebe9d17979b3d92fc03ce7a428cb852e7401df4f0 /activerecord/lib
parent45b17cee59ed856294c29e5127027a1d5afae7db (diff)
parent3d1a879f4cf9931a81477b63f9f999d52bac771c (diff)
downloadrails-8313f3c5771bfaa3325446d2bbe29c405f8b22c4.tar.gz
rails-8313f3c5771bfaa3325446d2bbe29c405f8b22c4.tar.bz2
rails-8313f3c5771bfaa3325446d2bbe29c405f8b22c4.zip
Merge pull request #8838 from yahonda/8806_3-2-stable
Ignore binds payload with nil column in AR log subscriber
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/log_subscriber.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
index a25f2c7bca..2b6488f183 100644
--- a/activerecord/lib/active_record/log_subscriber.rb
+++ b/activerecord/lib/active_record/log_subscriber.rb
@@ -32,7 +32,11 @@ module ActiveRecord
unless (payload[:binds] || []).empty?
binds = " " + payload[:binds].map { |col,v|
- [col.name, v]
+ if col
+ [col.name, v]
+ else
+ [nil, v]
+ end
}.inspect
end