diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-11-28 12:27:47 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-11-28 12:27:47 -0800 |
| commit | 66e87b714b406a25af60156a1fa15d1ebb99a0bd (patch) | |
| tree | 238ac027061c13226ab8995fc4b534afb6521ba3 /activerecord/lib | |
| parent | 9d97ef8f21ac583838230599fdbf812b27a5bc45 (diff) | |
| parent | 4325bec1d46de4a7fbe094ae18e83648532e2ddf (diff) | |
| download | rails-66e87b714b406a25af60156a1fa15d1ebb99a0bd.tar.gz rails-66e87b714b406a25af60156a1fa15d1ebb99a0bd.tar.bz2 rails-66e87b714b406a25af60156a1fa15d1ebb99a0bd.zip | |
Merge pull request #7689 from cbarton/assume_migration_version_with_prefix_fix
Fixing a schema:load when using a prefix and suffix on the tables [Reopen/backport]
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index e6686597b7..6420f81347 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -458,7 +458,7 @@ module ActiveRecord say_with_time "#{method}(#{arg_list})" do unless reverting? unless arguments.empty? || method == :execute - arguments[0] = Migrator.proper_table_name(arguments.first) + arguments[0] = Migrator.proper_table_name(arguments.first) unless method == :assume_migrated_upto_version arguments[1] = Migrator.proper_table_name(arguments.second) if method == :rename_table end end |