Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

1 files changed, 27 insertions, 0 deletions

diff --git a/activerecord/lib/active_record/railties/log_subscriber.rb b/activerecord/lib/active_record/railties/log_subscriber.rb
new file mode 100644
index 0000000000..48b25032ce
--- /dev/null
+++ b/activerecord/lib/active_record/railties/log_subscriber.rb
@@ -0,0 +1,27 @@
+module ActiveRecord
+  module Railties
+    class LogSubscriber < Rails::LogSubscriber
+      def sql(event)
+        name = '%s (%.1fms)' % [event.payload[:name], event.duration]
+        sql  = event.payload[:sql].squeeze(' ')
+
+        if odd?
+          name = color(name, :cyan, true)
+          sql  = color(sql, nil, true)
+        else
+          name = color(name, :magenta, true)
+        end
+
+        debug "  #{name}  #{sql}"
+      end
+
+      def odd?
+        @odd_or_even = !@odd_or_even
+      end
+
+      def logger
+        ActiveRecord::Base.logger
+      end
+    end
+  end
+end
\ No newline at end of file