mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #28869 from eugeneius/query_cache_all_pools
Enable query cache on all connection pools
This commit is contained in:
commit
cd3c0fa3d0
2 changed files with 18 additions and 6 deletions
|
@ -26,16 +26,19 @@ module ActiveRecord
|
|||
end
|
||||
|
||||
def self.run
|
||||
caching_pool = ActiveRecord::Base.connection_pool
|
||||
caching_was_enabled = caching_pool.query_cache_enabled
|
||||
ActiveRecord::Base.connection_handler.connection_pool_list.map do |pool|
|
||||
caching_was_enabled = pool.query_cache_enabled
|
||||
|
||||
caching_pool.enable_query_cache!
|
||||
pool.enable_query_cache!
|
||||
|
||||
[caching_pool, caching_was_enabled]
|
||||
[pool, caching_was_enabled]
|
||||
end
|
||||
end
|
||||
|
||||
def self.complete((caching_pool, caching_was_enabled))
|
||||
caching_pool.disable_query_cache! unless caching_was_enabled
|
||||
def self.complete(caching_pools)
|
||||
caching_pools.each do |pool, caching_was_enabled|
|
||||
pool.disable_query_cache! unless caching_was_enabled
|
||||
end
|
||||
|
||||
ActiveRecord::Base.connection_handler.connection_pool_list.each do |pool|
|
||||
pool.release_connection if pool.active_connection? && !pool.connection.transaction_open?
|
||||
|
|
|
@ -452,6 +452,15 @@ class QueryCacheTest < ActiveRecord::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
def test_query_cache_is_enabled_on_all_connection_pools
|
||||
middleware {
|
||||
ActiveRecord::Base.connection_handler.connection_pool_list.each do |pool|
|
||||
assert pool.query_cache_enabled
|
||||
assert pool.connection.query_cache_enabled
|
||||
end
|
||||
}.call({})
|
||||
end
|
||||
|
||||
private
|
||||
def middleware(&app)
|
||||
executor = Class.new(ActiveSupport::Executor)
|
||||
|
|
Loading…
Reference in a new issue