diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/query_cache.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 698ad6263a..277adb934b 100644 --- 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 index a8af89fcb9..e1d77975d3 100644 --- a/activerecord/lib/active_record/query_cache.rb +++ b/activerecord/lib/active_record/query_cache.rb @@ -7,6 +7,8 @@ module ActiveRecord 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. |