diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-03 04:33:52 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-12-03 04:33:52 -0800 |
| commit | f654c996dcf5e4e87be887246503cea6f881e028 (patch) | |
| tree | f35ba3e98f3fe87ea55a8630f5c45f27a72ccd3e /activerecord/lib | |
| parent | b6f189e2f0bcc8f36f52c83e8ac2255d5e578a42 (diff) | |
| parent | 1ed81e85ca1d2518400b56c167f3c196c51afede (diff) | |
| download | rails-f654c996dcf5e4e87be887246503cea6f881e028.tar.gz rails-f654c996dcf5e4e87be887246503cea6f881e028.tar.bz2 rails-f654c996dcf5e4e87be887246503cea6f881e028.zip | |
Merge pull request #11643 from vipulnsward/query_cache_clear
Fix QueryCache to work with nested blocks
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb index 8399232d73..adc23a6674 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb @@ -31,8 +31,8 @@ module ActiveRecord old, @query_cache_enabled = @query_cache_enabled, true yield ensure - clear_query_cache @query_cache_enabled = old + clear_query_cache unless @query_cache_enabled end def enable_query_cache! |