aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-07 13:01:33 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-07 13:01:33 -0300
commitbfcdc401d1300536bf61ae10670ddfb9ee14f295 (patch)
tree6493141a3b5faecba0031d828c96f35cb63c726f
parent09206716f8695f6b8467f15c1befa5a4c3c10978 (diff)
parenta93c3847aceed04e67f962a32711b8c357389f17 (diff)
downloadrails-bfcdc401d1300536bf61ae10670ddfb9ee14f295.tar.gz
rails-bfcdc401d1300536bf61ae10670ddfb9ee14f295.tar.bz2
rails-bfcdc401d1300536bf61ae10670ddfb9ee14f295.zip
Merge pull request #16078 from tgxworld/retreive_connection_once
Avoid retrieving connection in ActiveRecord::QueryCache multiple times.
-rw-r--r--activerecord/lib/active_record/query_cache.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
index df8654e5c1..16ad942912 100644
--- a/activerecord/lib/active_record/query_cache.rb
+++ b/activerecord/lib/active_record/query_cache.rb
@@ -29,9 +29,10 @@ module ActiveRecord
end
def call(env)
- enabled = ActiveRecord::Base.connection.query_cache_enabled
+ connection = ActiveRecord::Base.connection
+ enabled = connection.query_cache_enabled
connection_id = ActiveRecord::Base.connection_id
- ActiveRecord::Base.connection.enable_query_cache!
+ connection.enable_query_cache!
response = @app.call(env)
response[2] = Rack::BodyProxy.new(response[2]) do