Skip to content
This repository
Browse code

Removed query cache rescue as it could cause code to be run twice (cl…

…oses #10408) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8329 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 7f02cdd4a0cf4596e0f6fe99849486c43b87024a 1 parent db885e8
David Heinemeier Hansson authored December 07, 2007
5  activerecord/CHANGELOG
... ...
@@ -1,3 +1,8 @@
  1
+*2.0.1* (December 7th, 2007)
  2
+
  3
+* Removed query cache rescue as it could cause code to be run twice (closes #10408) [DHH]
  4
+
  5
+
1 6
 *2.0.0* (December 6th, 2007)
2 7
 
3 8
 * 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]
2  activerecord/lib/active_record/query_cache.rb
@@ -7,8 +7,6 @@ def cache(&block)
7 7
       else
8 8
         connection.cache(&block)
9 9
       end
10  
-    rescue
11  
-      yield # if the database is not present, don't let the cache spoil the party
12 10
     end
13 11
 
14 12
     # Disable the query cache within the block if Active Record is configured.
2  release.rb
... ...
@@ -1,4 +1,4 @@
1  
-#!/usr/local/bin/ruby
  1
+#!/usr/bin/env ruby
2 2
 
3 3
 VERSION  = ARGV.first
4 4
 PACKAGES = %w(activesupport activerecord actionpack actionmailer activeresource)

0 notes on commit 7f02cdd

Please sign in to comment.
Something went wrong with that request. Please try again.