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)