kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

dont call #collect on a string when returning query cache results. Closes #9099 [norbert]

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7239 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Rick Olson 2007-07-25 13:05:58 +00:00
parent f5ea6f880f
commit ea07212d97
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/query_cache.rb
View file

@ -61,7 +61,7 @@ module ActiveRecord
if result
# perform a deep #dup in case result is an array
result = result.collect { |row| row.dup } if result.respond_to?(:collect)
result = result.collect { |row| row.dup } if result.is_a?(Array)
result.dup
else
nil

6
activerecord/test/query_cache_test.rb
View file

@ -57,6 +57,12 @@ class QueryCacheTest < Test::Unit::TestCase
"Connections should be different, Course connects to a different database"
end
end
def test_cache_does_not_wrap_string_results_in_arrays
Task.cache do
assert_instance_of String, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks")
end
end
end
uses_mocha('QueryCacheExpiryTest') do