Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 7239

Show
Ignore:
Timestamp:
07/25/07 13:05:58 (1 year ago)
Author:
rick
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/activerecord/lib/active_record/query_cache.rb

    r7238 r7239  
    6262        if result 
    6363          # perform a deep #dup in case result is an array 
    64           result = result.collect { |row| row.dup } if result.respond_to?(:collect
     64          result = result.collect { |row| row.dup } if result.is_a?(Array
    6565          result.dup 
    6666        else 
  • trunk/activerecord/test/query_cache_test.rb

    r7238 r7239  
    5858    end 
    5959  end 
     60 
     61  def test_cache_does_not_wrap_string_results_in_arrays  
     62    Task.cache do  
     63      assert_instance_of String, Task.connection.select_value("SELECT count(*) AS count_all FROM tasks")  
     64    end  
     65  end  
    6066end 
    6167