From 36cc1f78eb17765f51e88085c30c39f40f3cb611 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Fri, 2 Dec 2011 09:19:13 -0800 Subject: revises some details in the previous explain patch --- activerecord/lib/active_record/explain.rb | 4 ++-- activerecord/lib/active_record/relation.rb | 2 +- railties/CHANGELOG.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/activerecord/lib/active_record/explain.rb b/activerecord/lib/active_record/explain.rb index ab3a45ae53..4d013f0ef4 100644 --- a/activerecord/lib/active_record/explain.rb +++ b/activerecord/lib/active_record/explain.rb @@ -1,5 +1,5 @@ module ActiveRecord - module Explain # :nodoc + module Explain # :nodoc: # logging_query_plan calls could appear nested in the call stack. In # particular this happens when a relation fetches its records, since # that results in find_by_sql calls downwards. @@ -31,7 +31,7 @@ module ActiveRecord # 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. - SKIP_EXPLAIN_FOR = %(SCHEMA EXPLAIN) + SKIP_EXPLAIN_FOR = %w(SCHEMA EXPLAIN) def ignore_explain_notification?(payload) payload[:exception] || SKIP_EXPLAIN_FOR.include?(payload[:name]) end diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index e69e1aeaf8..1db26562b8 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -155,7 +155,7 @@ module ActiveRecord # Please see further details in the # {Active Record Query Interface guide}[http://edgeguides.rubyonrails.org/active_record_querying.html#running-explain]. def explain - results, sqls, binds = collecting_sqls_for_explain { exec_query } + _, sqls, binds = collecting_sqls_for_explain { exec_query } exec_explain(sqls, binds) end diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index a324486d6f..64abff6cb3 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -5,7 +5,7 @@ configuration files. With a value of 0.5 in development.rb, and commented out in production.rb. No mention in test.rb. *fxn* -* Display mounted engine's routes in `rake routes`. *Piotr Sarnacki* +* Add DebugExceptions middleware which contains features extracted from ShowExceptions middleware *José Valim* * Display mounted engine's routes in `rake routes` *Piotr Sarnacki* -- cgit v1.2.3