diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-09-08 02:58:25 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-09-08 03:03:02 -0700 |
commit | bac28d3bbdbe59109ac532935f06c2603ffe0fcd (patch) | |
tree | 2ff9488a27a142e1e3c89eb5c2d22e6273e51ff4 /activerecord/lib/active_record | |
parent | c989a18a74d970be86c537766f14916bd06fe176 (diff) | |
download | rails-bac28d3bbdbe59109ac532935f06c2603ffe0fcd.tar.gz rails-bac28d3bbdbe59109ac532935f06c2603ffe0fcd.tar.bz2 rails-bac28d3bbdbe59109ac532935f06c2603ffe0fcd.zip |
Fix fixtures regression that required table names to map to classes only, not class names
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 6780e309f2..65648d82af 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -479,7 +479,7 @@ module ActiveRecord fixture_sets = files_to_read.map do |fs_name| klass = class_names[fs_name] - conn = klass ? klass.connection : connection + conn = klass.respond_to?(:connection) ? klass.connection : connection fixtures_map[fs_name] = new( # ActiveRecord::FixtureSet.new conn, fs_name, |