aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2017-02-25 19:32:50 +0200
committerbogdanvlviv <bogdanvlviv@gmail.com>2017-04-19 23:37:58 +0300
commitbb9d6eb094f29bb94ef1f26aa44f145f17b973fe (patch)
treebafe0fe871e0a1d2249c16f48f077b242c6c7426 /activerecord
parentb77d2aa0c336492ba33cbfade4964ba0eda3ef84 (diff)
downloadrails-bb9d6eb094f29bb94ef1f26aa44f145f17b973fe.tar.gz
rails-bb9d6eb094f29bb94ef1f26aa44f145f17b973fe.tar.bz2
rails-bb9d6eb094f29bb94ef1f26aa44f145f17b973fe.zip
Add additional raise UnknownMigrationVersionError
Raise error on the movement of migrations when the current migration does not exist.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md5
-rw-r--r--activerecord/lib/active_record/migration.rb12
2 files changed, 12 insertions, 5 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index d8f93280cd..f0cfd0469e 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Raise error `UnknownMigrationVersionError` on the movement of migrations
+ when the current migration does not exist.
+
+ *bogdanvlviv*
+
* Fix `bin/rails db:forward` first migration.
*bogdanvlviv*
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 43b6a746e0..51c82f4ced 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -1105,6 +1105,10 @@ module ActiveRecord
def move(direction, migrations_paths, steps)
migrator = new(direction, migrations(migrations_paths))
+ if current_version != 0 && !migrator.current_migration
+ raise UnknownMigrationVersionError.new(current_version)
+ end
+
start_index =
if current_version == 0
0
@@ -1112,11 +1116,9 @@ module ActiveRecord
migrator.migrations.index(migrator.current_migration)
end
- if start_index
- finish = migrator.migrations[start_index + steps]
- version = finish ? finish.version : 0
- send(direction, migrations_paths, version)
- end
+ finish = migrator.migrations[start_index + steps]
+ version = finish ? finish.version : 0
+ send(direction, migrations_paths, version)
end
end