diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-12-28 03:35:12 -0800 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-12-28 03:35:12 -0800 |
| commit | 4af5252d368cbc12d79f1a7ca87e7367f7daa40b (patch) | |
| tree | c550b0b50341c6921d82a1bf8920f0ded6dbabf2 /activerecord/lib/active_record | |
| parent | 1a7701522d2308df801ba1f375cb0626386928a5 (diff) | |
| parent | 64f106dfd1bcff13882ef2be44585f68c6cb9950 (diff) | |
| download | rails-4af5252d368cbc12d79f1a7ca87e7367f7daa40b.tar.gz rails-4af5252d368cbc12d79f1a7ca87e7367f7daa40b.tar.bz2 rails-4af5252d368cbc12d79f1a7ca87e7367f7daa40b.zip | |
Merge pull request #4153 from alexeymuranov/my_fix_for_prefix_suffix_fixtures_test
Fix a fixtures test case with table prefix/suffix
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 65c7f3afbb..deffc7cec5 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -486,8 +486,8 @@ module ActiveRecord # Cap primary key sequences to max(pk). if connection.respond_to?(:reset_pk_sequence!) - table_names.each do |table_name| - connection.reset_pk_sequence!(table_name.tr('/', '_')) + fixture_files.each do |ff| + connection.reset_pk_sequence!(ff.table_name) end end end |