diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-01-03 22:49:10 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-01-03 22:50:08 -0700 |
commit | 78372b6cbb655227f4e6ddcb32187704659de84f (patch) | |
tree | fe4e05780e19ff288c415a113409954a21ff66cf /activerecord/lib/active_record | |
parent | 4b81007acf33527522aa41965e4a476602d2dd4d (diff) | |
download | rails-78372b6cbb655227f4e6ddcb32187704659de84f.tar.gz rails-78372b6cbb655227f4e6ddcb32187704659de84f.tar.bz2 rails-78372b6cbb655227f4e6ddcb32187704659de84f.zip |
create_fixtures should accept symbol keys for custom table -> class mappings. Fixes an unintended regression.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index c85d54f28b..9ea8cf864c 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -445,7 +445,8 @@ module ActiveRecord self.all_loaded_fixtures = {} def self.create_fixtures(fixtures_directory, table_names, class_names = {}) - table_names = [table_names].flatten.map { |n| n.to_s } + table_names = Array(table_names).map(&:to_s) + class_names = class_names.stringify_keys # FIXME: Apparently JK uses this. connection = block_given? ? yield : ActiveRecord::Base.connection @@ -464,7 +465,7 @@ module ActiveRecord fixtures_map[fixture_name] = new( # ActiveRecord::Fixtures.new connection, fixture_name, - class_names[fixture_name] || default_fixture_model_name(fixture_name), + class_names[fixture_name.to_s] || default_fixture_model_name(fixture_name), ::File.join(fixtures_directory, path)) end @@ -728,6 +729,7 @@ module ActiveRecord self.pre_loaded_fixtures = false self.fixture_class_names = Hash.new do |h, fixture_name| + fixture_name = fixture_name.to_s h[fixture_name] = ActiveRecord::Fixtures.default_fixture_model_name(fixture_name) end end |