Restore connection_id on error.

1 files changed, 10 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
index 9701898415..d64dee10fe 100644
--- a/activerecord/lib/active_record/query_cache.rb
+++ b/activerecord/lib/active_record/query_cache.rb
@@ -34,16 +34,22 @@ module ActiveRecord
 
       response = @app.call(env)
       response[2] = Rack::BodyProxy.new(response[2]) do
-        ActiveRecord::Base.connection_id = connection_id
-        ActiveRecord::Base.connection.clear_query_cache
-        ActiveRecord::Base.connection.disable_query_cache! unless enabled
+        restore_query_cache_settings(connection_id, enabled)
       end
 
       response
     rescue Exception => e
+      restore_query_cache_settings(connection_id, enabled)
+      raise e
+    end
+
+    private
+
+    def restore_query_cache_settings(connection_id, enabled)
+      ActiveRecord::Base.connection_id = connection_id
       ActiveRecord::Base.connection.clear_query_cache
       ActiveRecord::Base.connection.disable_query_cache! unless enabled
-      raise e
     end
+
   end
 end