diff options
| -rw-r--r-- | activerecord/CHANGELOG | 5 | ||||
| -rw-r--r-- | activerecord/lib/active_record/query_cache.rb | 2 | ||||
| -rwxr-xr-x | release.rb | 2 |
3 files changed, 6 insertions, 3 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. diff --git a/release.rb b/release.rb index a019a52e4f..94d2219525 100755 --- a/release.rb +++ b/release.rb @@ -1,4 +1,4 @@ -#!/usr/local/bin/ruby +#!/usr/bin/env ruby VERSION = ARGV.first PACKAGES = %w(activesupport activerecord actionpack actionmailer activeresource) |