aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation.rb
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-02-24 18:59:34 +0100
committerYves Senn <yves.senn@gmail.com>2013-02-24 20:01:04 +0100
commitd3688e02ca52c0b72d3092e8498da51e06b7fc58 (patch)
tree7b41894f42e908dbed53c664f55e8fb3961e1b3c /activerecord/lib/active_record/relation.rb
parent5fc3b87c93edf770ea0d6b52a28ea225183dbfd7 (diff)
downloadrails-d3688e02ca52c0b72d3092e8498da51e06b7fc58.tar.gz
rails-d3688e02ca52c0b72d3092e8498da51e06b7fc58.tar.bz2
rails-d3688e02ca52c0b72d3092e8498da51e06b7fc58.zip
remove AR auto-explain (config.auto_explain_threshold_in_seconds)
We discussed that the auto explain feature is rarely used. This PR removes only the automatic explain. You can still display the explain output for any given relation using `ActiveRecord::Relation#explain`. As a side-effect this should also fix the connection problem during asset compilation (#9385). The auto explain initializer in the `ActiveRecord::Railtie` forced a connection.
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r--activerecord/lib/active_record/relation.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 0053530f73..bc50802c4a 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -444,17 +444,7 @@ module ActiveRecord
#
# Post.where(published: true).load # => #<ActiveRecord::Relation>
def load
- unless loaded?
- # We monitor here the entire execution rather than individual SELECTs
- # because from the point of view of the user fetching the records of a
- # relation is a single unit of work. You want to know if this call takes
- # too long, not if the individual queries take too long.
- #
- # It could be the case that none of the queries involved surpass the
- # threshold, and at the same time the sum of them all does. The user
- # should get a query plan logged in that case.
- logging_query_plan { exec_queries }
- end
+ exec_queries unless loaded?
self
end