Ensure QueryCache doesn't try to dup numeric results (does not affect…

… the major OS database). Closes #7661 [tomafro, nzkoz] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7399 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Sep 2, 2007 · b18d956 · b18d956
1 parent 6b9b511
commit b18d956
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
@@ -59,12 +59,13 @@ def cache(sql)
           @query_cache[sql] = yield
         end
 
-        if result
+        case result
-          # perform a deep #dup in case result is an array
+        when Array
-          result = result.collect { |row| row.dup } if result.is_a?(Array)
+          result.collect { |row| row.dup }
-          result.dup
+        when Numeric, NilClass, FalseClass
+          result
         else
-          nil
+          result.dup
         end
       end
 

diff --git a/activerecord/test/query_cache_test.rb b/activerecord/test/query_cache_test.rb
@@ -16,7 +16,13 @@ def test_find_queries_with_cache
       assert_queries(1) {  Task.find(1); Task.find(1) }
     end
   end
-
+
+  def test_count_queries_with_cache
+    Task.cache do
+      assert_queries(1) {  Task.count; Task.count }
+    end
+  end
+
   def test_query_cache_returned
     assert_not_equal ActiveRecord::QueryCache, Task.connection.class
     Task.cache do