Permalink
Browse files

Use the query cache iff Active Record is configured.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6202 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent c8f7860 commit f425bba9cf6c6a7268a906cb888a8a3af4f9abcb @jeremy jeremy committed Feb 22, 2007
Showing with 16 additions and 8 deletions.
  1. +16 −8 activerecord/lib/active_record/query_cache.rb
@@ -87,14 +87,22 @@ def query_cache
def query_cache=(cache)
query_caches[self] = cache
end
-
- def cache
- self.query_cache = QueryCache.new(connection_without_query_cache)
- yield
- ensure
- self.query_cache = nil
- end
-
+
+ # Use a query cache within the given block.
+ def cache
+ # Don't cache if Active Record is not configured.
+ if ActiveRecord::Base.configurations.blank?
+ yield
+ else
+ begin
+ self.query_cache = QueryCache.new(connection_without_query_cache)
+ yield
+ ensure
+ self.query_cache = nil
+ end
+ end
+ end
+
def connection
query_cache || connection_without_query_cache
end

0 comments on commit f425bba

Please sign in to comment.