aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/migration.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-04-19 19:33:37 -0400
committerGitHub <noreply@github.com>2017-04-19 19:33:37 -0400
commit7ce850cd627dc87874affa25efd8349cf329ccc5 (patch)
treefe2e4722211ef05810dc129d3ef8bb086a2977f5 /activerecord/lib/active_record/migration.rb
parent2b181538bb4087cfde22f31badb73d5a3aa65adf (diff)
parentbb9d6eb094f29bb94ef1f26aa44f145f17b973fe (diff)
downloadrails-7ce850cd627dc87874affa25efd8349cf329ccc5.tar.gz
rails-7ce850cd627dc87874affa25efd8349cf329ccc5.tar.bz2
rails-7ce850cd627dc87874affa25efd8349cf329ccc5.zip
Merge pull request #28166 from bogdanvlviv/fix_migration_tasks
Fix migration tasks
Diffstat (limited to 'activerecord/lib/active_record/migration.rb')
-rw-r--r--activerecord/lib/active_record/migration.rb18
1 files changed, 13 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 4e1df1432c..51c82f4ced 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -1104,13 +1104,21 @@ module ActiveRecord
def move(direction, migrations_paths, steps)
migrator = new(direction, migrations(migrations_paths))
- start_index = migrator.migrations.index(migrator.current_migration)
- if start_index
- finish = migrator.migrations[start_index + steps]
- version = finish ? finish.version : 0
- send(direction, migrations_paths, version)
+ if current_version != 0 && !migrator.current_migration
+ raise UnknownMigrationVersionError.new(current_version)
end
+
+ start_index =
+ if current_version == 0
+ 0
+ else
+ migrator.migrations.index(migrator.current_migration)
+ end
+
+ finish = migrator.migrations[start_index + steps]
+ version = finish ? finish.version : 0
+ send(direction, migrations_paths, version)
end
end