diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-09-02 10:51:23 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-09-02 10:51:23 +0000 |
| commit | e3d34286e338bdd6c7681e08a0d79a955dc24ca1 (patch) | |
| tree | b791cf50fd0123c309e812b5206435014a8e4067 /activerecord/lib | |
| parent | bf3f920989f3b1e06109335212c9127396e5cfc2 (diff) | |
| download | rails-e3d34286e338bdd6c7681e08a0d79a955dc24ca1.tar.gz rails-e3d34286e338bdd6c7681e08a0d79a955dc24ca1.tar.bz2 rails-e3d34286e338bdd6c7681e08a0d79a955dc24ca1.zip | |
Fixtures ignore table name prefix and suffix #1987 [Jakob S]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2101 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record/fixtures.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index dab719946f..fd1de46c1d 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -232,6 +232,7 @@ class Fixtures < Hash end all_loaded_fixtures.merge! fixtures_map + connection.transaction do fixtures.reverse.each { |fixture| fixture.delete_existing_fixtures } fixtures.each { |fixture| fixture.insert_fixtures } @@ -265,8 +266,9 @@ class Fixtures < Hash def initialize(connection, table_name, fixture_path, file_filter = DEFAULT_FILTER_RE) @connection, @table_name, @fixture_path, @file_filter = connection, table_name, fixture_path, file_filter - @class_name = Inflector.classify(@table_name) + @class_name = Inflector.classify(@table_name) + @table_name = ActiveRecord::Base.table_name_prefix + @table_name + ActiveRecord::Base.table_name_suffix read_fixture_files end |