diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-07 13:34:06 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-07 13:34:06 +0000 |
| commit | 7f02cdd4a0cf4596e0f6fe99849486c43b87024a (patch) | |
| tree | 8d71c0aa6832ec0993555a79d61b2c36dc1468ac /activerecord | |
| parent | db885e81b9dc918a75bd66b1631a13e10447d0ff (diff) | |
| download | rails-7f02cdd4a0cf4596e0f6fe99849486c43b87024a.tar.gz rails-7f02cdd4a0cf4596e0f6fe99849486c43b87024a.tar.bz2 rails-7f02cdd4a0cf4596e0f6fe99849486c43b87024a.zip | |
Removed query cache rescue as it could cause code to be run twice (closes #10408) [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8329 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 5 | ||||
| -rw-r--r-- | activerecord/lib/active_record/query_cache.rb | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 6e6cec03ae..d7bacfef67 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,3 +1,8 @@ +*2.0.1* (December 7th, 2007) + +* Removed query cache rescue as it could cause code to be run twice (closes #10408) [DHH] + + *2.0.0* (December 6th, 2007) * Anchor DateTimeTest to fixed DateTime instead of a variable value based on Time.now#advance#to_datetime, so that this test passes on 64-bit platforms running Ruby 1.8.6+ [Geoff Buesing] diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb index e1d77975d3..a8af89fcb9 100644 --- a/activerecord/lib/active_record/query_cache.rb +++ b/activerecord/lib/active_record/query_cache.rb @@ -7,8 +7,6 @@ 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. |