kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Merge pull request #41256 from eileencodes/revert-qc-changes 

Revert qc changes
This commit is contained in:
Eileen M. Uchitelle 2021-01-27 11:50:09 -05:00 committed by GitHub
parent 3921f247f3 7f2f870b36
commit bcc6c4b2ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
activerecord/lib/active_record/query_cache.rb
View File

@ -26,26 +26,30 @@ module ActiveRecord
end
def self.run
pools = []
if ActiveRecord::Base.legacy_connection_handling
ActiveRecord::Base.connection_handlers.each_value do |handler|
handler.connection_pool_list.each(&:enable_query_cache!)
ActiveRecord::Base.connection_handlers.each do |key, handler|
pools.concat(handler.connection_pool_list.reject { |p| p.query_cache_enabled }.each { |p| p.enable_query_cache! })
end
else
ActiveRecord::Base.connection_handler.all_connection_pools.each(&:enable_query_cache!)
pools.concat(ActiveRecord::Base.connection_handler.all_connection_pools.reject { |p| p.query_cache_enabled }.each { |p| p.enable_query_cache! })
end
pools
end
def self.complete(_)
def self.complete(pools)
pools.each { |pool| pool.disable_query_cache! }
if ActiveRecord::Base.legacy_connection_handling
ActiveRecord::Base.connection_handlers.each_value do |handler|
ActiveRecord::Base.connection_handlers.each do |_, handler|
handler.connection_pool_list.each do |pool|
pool.disable_query_cache!
pool.release_connection if pool.active_connection? && !pool.connection.transaction_open?
end
end
else
ActiveRecord::Base.connection_handler.all_connection_pools.each do |pool|
pool.disable_query_cache!
pool.release_connection if pool.active_connection? && !pool.connection.transaction_open?
end
end