diff options
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/query_cache.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb index e25335ecea..e598de07e2 100644 --- a/activerecord/lib/active_record/query_cache.rb +++ b/activerecord/lib/active_record/query_cache.rb @@ -59,12 +59,13 @@ module ActiveRecord @query_cache[sql] = yield end - if result - # perform a deep #dup in case result is an array - result = result.collect { |row| row.dup } if result.is_a?(Array) - result.dup + case result + when Array + result.collect { |row| row.dup } + when Numeric, NilClass, FalseClass + result else - nil + result.dup end end |