Fixed that the Query Cache should just be ignored if the database is …

…misconfigured (so that the "About your applications environment" works even before the database has been created) [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8325 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Dec 6, 2007 · 731ecec · 731ecec
1 parent 699da70
commit 731ecec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *2.0.0* (December 6th, 2007)
 
+* Fixed that the Query Cache should just be ignored if the database is misconfigured (so that the "About your applications environment" works even before the database has been created) [DHH]
+
 * Fixed that the truncation of strings longer than 50 chars should use inspect so newlines etc are escaped #10385 [norbert]
 
 * Fixed that habtm associations should be able to set :select as part of their definition and have that honored [DHH]

diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
@@ -7,6 +7,8 @@ def cache(&block)
       else
         connection.cache(&block)
       end
+    rescue
+      yield # if the database is not present, don't let the cache spoil the party
     end
 
     # Disable the query cache within the block if Active Record is configured.