aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2007-07-25 13:05:58 +0000
committerRick Olson <technoweenie@gmail.com>2007-07-25 13:05:58 +0000
commitea07212d9780841fbfb3368247ccc0b4bdee5bf5 (patch)
tree6acfef274e6e1a8d12cb19aeb8280bbd9c97b255 /activerecord/lib/active_record
parentf5ea6f880f365c5383d029bddc917baa82e56d55 (diff)
downloadrails-ea07212d9780841fbfb3368247ccc0b4bdee5bf5.tar.gz
rails-ea07212d9780841fbfb3368247ccc0b4bdee5bf5.tar.bz2
rails-ea07212d9780841fbfb3368247ccc0b4bdee5bf5.zip
dont call #collect on a string when returning query cache results. Closes #9099 [norbert]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7239 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/query_cache.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
index 191e5a3d97..e25335ecea 100644
--- a/activerecord/lib/active_record/query_cache.rb
+++ b/activerecord/lib/active_record/query_cache.rb
@@ -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