diff options
| author | Arthur Neves <arthurnn@gmail.com> | 2016-06-14 12:31:08 -0400 |
|---|---|---|
| committer | Arthur Neves <arthurnn@gmail.com> | 2016-06-14 12:37:50 -0400 |
| commit | 009b2a54344eb2463fa4018d9b20cdfc4c0495ac (patch) | |
| tree | c68c9d5ba83aee03675a564cbb2df572489a63ed /activerecord/lib | |
| parent | 596669cfac8e63d14f905bc1a8891796d3c00b02 (diff) | |
| download | rails-009b2a54344eb2463fa4018d9b20cdfc4c0495ac.tar.gz rails-009b2a54344eb2463fa4018d9b20cdfc4c0495ac.tar.bz2 rails-009b2a54344eb2463fa4018d9b20cdfc4c0495ac.zip | |
Respect the current `connected?` method when calling `cache`
Before we enable query caching we check if the connection is
connected. Before this fix we were always checking against the main
connection, and not the model connection.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/query_cache.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb index ca12a603da..07d863d15e 100644 --- a/activerecord/lib/active_record/query_cache.rb +++ b/activerecord/lib/active_record/query_cache.rb @@ -5,7 +5,7 @@ module ActiveRecord # Enable the query cache within the block if Active Record is configured. # If it's not, it will execute the given block. def cache(&block) - if ActiveRecord::Base.connected? + if connected? connection.cache(&block) else yield @@ -15,7 +15,7 @@ module ActiveRecord # Disable the query cache within the block if Active Record is configured. # If it's not, it will execute the given block. def uncached(&block) - if ActiveRecord::Base.connected? + if connected? connection.uncached(&block) else yield |