diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-02-09 05:07:15 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-02-09 05:07:15 -0800 |
| commit | d36a88435ee0e370be763de85b5e4376591849ac (patch) | |
| tree | 56e4d1ea0422b30c182132e897fc3707cc4adf10 /activerecord/lib | |
| parent | 31aa822b4c5ccf9df3bb2be1886384e9a5072499 (diff) | |
| parent | 2ee85c39bd8544d393b2c97bbc166a5f77589e63 (diff) | |
| download | rails-d36a88435ee0e370be763de85b5e4376591849ac.tar.gz rails-d36a88435ee0e370be763de85b5e4376591849ac.tar.bz2 rails-d36a88435ee0e370be763de85b5e4376591849ac.zip | |
Merge pull request #4965 from raghunadhd/fix_hash
Refactored the OrderedHash related stuff
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index cf315b687c..b82d5b5621 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -3,7 +3,6 @@ require 'yaml' require 'zlib' require 'active_support/dependencies' require 'active_support/core_ext/object/blank' -require 'active_support/ordered_hash' require 'active_record/fixtures/file' if defined? ActiveRecord @@ -508,7 +507,7 @@ module ActiveRecord @name = fixture_name @class_name = class_name - @fixtures = ActiveSupport::OrderedHash.new + @fixtures = {} # Should be an AR::Base type class if class_name.is_a?(Class) |