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

Changeset 8524

Show
Ignore:
Timestamp:
01/02/08 09:11:39 (9 months ago)
Author:
bitsweat
Message:

Ruby 1.9 compat: fix two failing tests since String#each has been removed. Closes #10655.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/activerecord/CHANGELOG

    r8504 r8524  
    77* SQLite: fix rename_ and remove_column for columns with unique indexes.  #10576 [Brandon Keepers] 
    88 
    9 * Ruby 1.9 compatibility.  [Jeremy Kemper] 
     9* Ruby 1.9 compatibility.  #10655 [Jeremy Kemper, Dirkjan Bussink] 
    1010 
    1111 

  • trunk/activerecord/lib/active_record/fixtures.rb

    r8480 r8524  
    705705 
    706706        yaml_value.each do |fixture| 
    707           fixture.each do |name, data| 
     707          raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{fixture}" unless fixture.respond_to?(:each) 
     708          fixture.each do |name, data| 
    708709            unless data 
    709710              raise Fixture::FormatError, "Bad data for #{@class_name} fixture named #{name} (nil)" 
    …… 
    878879 
    879880      def self.setup_fixture_accessors(table_names = nil) 
     881        table_names = [table_names] if table_names && !table_names.respond_to?(:each) 
    880882        (table_names || fixture_table_names).each do |table_name| 
    881883          table_name = table_name.to_s.tr('.', '_')