aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-05-04 15:24:26 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-05-04 15:24:26 -0700
commit38d92d705e18d953bb0d8f4ba5d156755572acfb (patch)
treec01f8e1540045c81af038f9887519dd18b7a707c /activerecord/lib
parentbd4831d6995102f6003d401b2f257c8f8e553d7b (diff)
downloadrails-38d92d705e18d953bb0d8f4ba5d156755572acfb.tar.gz
rails-38d92d705e18d953bb0d8f4ba5d156755572acfb.tar.bz2
rails-38d92d705e18d953bb0d8f4ba5d156755572acfb.zip
ensure query cache is cleared when Rack body is closed, fixes bug reported on 951e18abea9c116fc5d6b330ca1dcd2890abe006
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/query_cache.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
index 929998eb85..4e61671473 100644
--- a/activerecord/lib/active_record/query_cache.rb
+++ b/activerecord/lib/active_record/query_cache.rb
@@ -40,6 +40,7 @@ module ActiveRecord
def close
@target.close if @target.respond_to?(:close)
ensure
+ ActiveRecord::Base.connection.clear_query_cache
unless @original_cache_value
ActiveRecord::Base.connection.disable_query_cache!
end