aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2013-03-06 00:35:55 +0900
committerkennyj <kennyj@gmail.com>2013-03-06 00:35:55 +0900
commite9fc2d3397af05ecc6083d56d4a36b78a0542324 (patch)
tree941c8ffea9ac2077b98ec4bf1106adb1edc51abb /activerecord/lib
parent588f267e71083928ee8b6375a444fb674dad8fcf (diff)
downloadrails-e9fc2d3397af05ecc6083d56d4a36b78a0542324.tar.gz
rails-e9fc2d3397af05ecc6083d56d4a36b78a0542324.tar.bz2
rails-e9fc2d3397af05ecc6083d56d4a36b78a0542324.zip
Remove unused return value, because collecting_queries_for_explain isn't public API.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/explain.rb3
-rw-r--r--activerecord/lib/active_record/relation.rb3
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/explain.rb b/activerecord/lib/active_record/explain.rb
index b2a9a54af1..3135465dfe 100644
--- a/activerecord/lib/active_record/explain.rb
+++ b/activerecord/lib/active_record/explain.rb
@@ -6,7 +6,8 @@ module ActiveRecord
def collecting_queries_for_explain # :nodoc:
current = Thread.current
original, current[:available_queries_for_explain] = current[:available_queries_for_explain], []
- return yield, current[:available_queries_for_explain]
+ yield
+ return current[:available_queries_for_explain]
ensure
# Note that the return value above does not depend on this assigment.
current[:available_queries_for_explain] = original
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index efbae108b9..ad54ba55b6 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -188,8 +188,7 @@ module ActiveRecord
# Please see further details in the
# {Active Record Query Interface guide}[http://guides.rubyonrails.org/active_record_querying.html#running-explain].
def explain
- _, queries = collecting_queries_for_explain { exec_queries }
- exec_explain(queries)
+ exec_explain(collecting_queries_for_explain { exec_queries })
end
# Converts relation objects to Array.