diff options
| author | rick <technoweenie@gmail.com> | 2008-06-19 09:59:36 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-06-19 09:59:36 -0700 |
| commit | 10c581a6deed66e8b62de6e7a3621a63de90baad (patch) | |
| tree | 588ceb1118761602caa8ccf248dd08d59f33896c /activerecord/lib/active_record/fixtures.rb | |
| parent | 64637da284ed4685591c178202ee103e6bee71cf (diff) | |
| parent | 81025b5808886289f54d698f73f4199c99223e7e (diff) | |
| download | rails-10c581a6deed66e8b62de6e7a3621a63de90baad.tar.gz rails-10c581a6deed66e8b62de6e7a3621a63de90baad.tar.bz2 rails-10c581a6deed66e8b62de6e7a3621a63de90baad.zip | |
fix merge
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
| -rwxr-xr-x | 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 c4cbe5d52f..e19614e31f 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -547,7 +547,7 @@ class Fixtures < (RUBY_VERSION < '1.9' ? YAML::Omap : Hash) @connection, @table_name, @fixture_path, @file_filter = connection, table_name, fixture_path, file_filter @class_name = class_name || (ActiveRecord::Base.pluralize_table_names ? @table_name.singularize.camelize : @table_name.camelize) - @table_name = ActiveRecord::Base.table_name_prefix + @table_name + ActiveRecord::Base.table_name_suffix + @table_name = "#{ActiveRecord::Base.table_name_prefix}#{@table_name}#{ActiveRecord::Base.table_name_suffix}" @table_name = class_name.table_name if class_name.respond_to?(:table_name) @connection = class_name.connection if class_name.respond_to?(:connection) read_fixture_files |