diff options
author | Xavier Noria <fxn@hashref.com> | 2011-12-04 13:53:26 -0800 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-12-04 13:53:26 -0800 |
commit | 4e74bd194beb6f51ee7c4bf06bfaab72d70f1c2c (patch) | |
tree | e73e3cef4b59e8e1a29052bf6a4de0788dbcd549 /activerecord/lib/active_record/explain_subscriber.rb | |
parent | 7f3ce35e1947c31233263a2cd48740646f5585b3 (diff) | |
download | rails-4e74bd194beb6f51ee7c4bf06bfaab72d70f1c2c.tar.gz rails-4e74bd194beb6f51ee7c4bf06bfaab72d70f1c2c.tar.bz2 rails-4e74bd194beb6f51ee7c4bf06bfaab72d70f1c2c.zip |
moves some auto explain logic to the subscriber [José Valim & Xavier Noria]
Diffstat (limited to 'activerecord/lib/active_record/explain_subscriber.rb')
-rw-r--r-- | activerecord/lib/active_record/explain_subscriber.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/explain_subscriber.rb b/activerecord/lib/active_record/explain_subscriber.rb index aa5cf263a6..fc76410499 100644 --- a/activerecord/lib/active_record/explain_subscriber.rb +++ b/activerecord/lib/active_record/explain_subscriber.rb @@ -1,9 +1,19 @@ require 'active_support/notifications' module ActiveRecord - class ExplainSubscriber + class ExplainSubscriber # :nodoc: def call(*args) - ActiveRecord::Base.collect_queries_for_explain(args.last) + if queries = Thread.current[:available_queries_for_explain] + payload = args.last + queries << payload.values_at(:sql, :binds) unless ignore_payload?(payload) + end + end + + # SCHEMA queries cannot be EXPLAINed, also we do not want to run EXPLAIN on + # our own EXPLAINs now matter how loopingly beautiful that would be. + IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN) + def ignore_payload?(payload) + payload[:exception] || IGNORED_PAYLOADS.include?(payload[:name]) end ActiveSupport::Notifications.subscribe("sql.active_record", new) |