1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Remove unused return value, because collecting_queries_for_explain isn't public API.

This commit is contained in:
kennyj 2013-03-06 00:35:55 +09:00
parent 588f267e71
commit e9fc2d3397
3 changed files with 4 additions and 5 deletions

View file

@ -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

View file

@ -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.

View file

@ -20,7 +20,7 @@ if ActiveRecord::Base.connection.supports_explain?
end
def test_collecting_queries_for_explain
result, queries = ActiveRecord::Base.collecting_queries_for_explain do
queries = ActiveRecord::Base.collecting_queries_for_explain do
Car.where(:name => 'honda').to_a
end
@ -28,7 +28,6 @@ if ActiveRecord::Base.connection.supports_explain?
assert_match "SELECT", sql
assert_match "honda", sql
assert_equal [], binds
assert_equal [cars(:honda)], result
end
def test_exec_explain_with_no_binds