Permalink
Browse files

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.
  • Loading branch information...
2 parents 267fb61 + fda9075 commit 5ed0381db5e6dff1269f3f22ec4fa69c203c37d9 @rafaelfranca rafaelfranca committed Nov 13, 2012
@@ -1,5 +1,10 @@
## Rails 3.2.10 (unreleased)
+* Use query cache/uncache when using ENV["DATABASE_URL"].
+ Fixes #6951. [Backport #8074]
+
+ *kennyj*
+
* Do not create useless database transaction when building `has_one` association. [Backport #8154]
Example:
@@ -6,19 +6,19 @@ class QueryCache
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
@@ -173,6 +173,17 @@ def test_cache_is_ignored_for_locked_relations
assert_queries(2) { task.lock!; task.lock! }
end
end
+
+ def test_cache_is_available_when_connection_is_connected
+ conf = ActiveRecord::Base.configurations
+
+ ActiveRecord::Base.configurations = {}
+ Task.cache do
+ assert_queries(1) { Task.find(1); Task.find(1) }
+ end
+ ensure
+ ActiveRecord::Base.configurations = conf
+ end
end
class QueryCacheExpiryTest < ActiveRecord::TestCase

0 comments on commit 5ed0381

Please sign in to comment.