aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/log_subscriber.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-12-04 11:55:53 -0800
committerXavier Noria <fxn@hashref.com>2011-12-04 11:55:53 -0800
commitd59bfeb1197960277f66ddb76ca544d8472ab8af (patch)
tree7b0ac3bef9af85a523b5dff4b243c5d9f6a38b36 /activerecord/lib/active_record/log_subscriber.rb
parent0ec0c9abe19496c6677da0fb538c688612d1a8f2 (diff)
parentcfeac38e2b149d39edeb9add452fbd2ff96679b9 (diff)
downloadrails-d59bfeb1197960277f66ddb76ca544d8472ab8af.tar.gz
rails-d59bfeb1197960277f66ddb76ca544d8472ab8af.tar.bz2
rails-d59bfeb1197960277f66ddb76ca544d8472ab8af.zip
Merge branch 'explain'
Diffstat (limited to 'activerecord/lib/active_record/log_subscriber.rb')
-rw-r--r--activerecord/lib/active_record/log_subscriber.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb
index 3a015ee8c2..a25f2c7bca 100644
--- a/activerecord/lib/active_record/log_subscriber.rb
+++ b/activerecord/lib/active_record/log_subscriber.rb
@@ -26,9 +26,9 @@ module ActiveRecord
return if 'SCHEMA' == payload[:name]
- name = '%s (%.1fms)' % [payload[:name], event.duration]
- sql = payload[:sql].squeeze(' ')
- binds = nil
+ name = '%s (%.1fms)' % [payload[:name], event.duration]
+ sql = payload[:sql].squeeze(' ')
+ binds = nil
unless (payload[:binds] || []).empty?
binds = " " + payload[:binds].map { |col,v|