Merge pull request #26978 from matthewd/query-cache-pool

Configure query caching (per thread) on the connection pool

1 files changed, 11 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
index 23dae825c2..ec246e97bc 100644
--- a/activerecord/lib/active_record/query_cache.rb
+++ b/activerecord/lib/active_record/query_cache.rb
@@ -24,12 +24,19 @@ module ActiveRecord
     end
 
     def self.run
-      ActiveRecord::Base.connection.enable_query_cache!
+      caching_pool = ActiveRecord::Base.connection_pool
+      caching_was_enabled = caching_pool.query_cache_enabled
+
+      caching_pool.enable_query_cache!
+
+      [caching_pool, caching_was_enabled]
     end
 
-    def self.complete(_)
-      unless ActiveRecord::Base.connected? && ActiveRecord::Base.connection.transaction_open?
-        ActiveRecord::Base.clear_active_connections!
+    def self.complete((caching_pool, caching_was_enabled))
+      caching_pool.disable_query_cache! unless caching_was_enabled
+
+      ActiveRecord::Base.connection_handler.connection_pool_list.each do |pool|
+        pool.release_connection if pool.active_connection? && !pool.connection.transaction_open?
       end
     end