diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-13 08:20:38 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-13 08:20:38 -0800 |
commit | 5ed0381db5e6dff1269f3f22ec4fa69c203c37d9 (patch) | |
tree | e6f454a3553e05b5a01c199b0b0bafe7f5eb06cf /activerecord/lib | |
parent | 267fb61277ac960ad443d239febcb3136a007d24 (diff) | |
parent | fda90755301553e184f625f3ba27d34888dbfad4 (diff) | |
download | rails-5ed0381db5e6dff1269f3f22ec4fa69c203c37d9.tar.gz rails-5ed0381db5e6dff1269f3f22ec4fa69c203c37d9.tar.bz2 rails-5ed0381db5e6dff1269f3f22ec4fa69c203c37d9.zip |
Merge pull request #8205 from kennyj/fix_6951-32
Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only database.yml but also DATABASE_URL.
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/query_cache.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb index 466d148901..2156889a0f 100644 --- a/activerecord/lib/active_record/query_cache.rb +++ b/activerecord/lib/active_record/query_cache.rb @@ -6,19 +6,19 @@ module ActiveRecord module ClassMethods # Enable the query cache within the block if Active Record is configured. def cache(&block) - if ActiveRecord::Base.configurations.blank? - yield - else + if ActiveRecord::Base.connected? connection.cache(&block) + else + yield end end # Disable the query cache within the block if Active Record is configured. def uncached(&block) - if ActiveRecord::Base.configurations.blank? - yield - else + if ActiveRecord::Base.connected? connection.uncached(&block) + else + yield end end end |