mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fix bin/rails db:forward
first migration
This commit is contained in:
parent
c324f5d8bb
commit
b77d2aa0c3
3 changed files with 36 additions and 1 deletions
|
@ -1,3 +1,7 @@
|
|||
* Fix `bin/rails db:forward` first migration.
|
||||
|
||||
*bogdanvlviv*
|
||||
|
||||
* Support Descending Indexes for MySQL.
|
||||
|
||||
MySQL 8.0.1 and higher supports descending indexes: `DESC` in an index definition is no longer ignored.
|
||||
|
|
|
@ -1104,7 +1104,13 @@ module ActiveRecord
|
|||
|
||||
def move(direction, migrations_paths, steps)
|
||||
migrator = new(direction, migrations(migrations_paths))
|
||||
start_index = migrator.migrations.index(migrator.current_migration)
|
||||
|
||||
start_index =
|
||||
if current_version == 0
|
||||
0
|
||||
else
|
||||
migrator.migrations.index(migrator.current_migration)
|
||||
end
|
||||
|
||||
if start_index
|
||||
finish = migrator.migrations[start_index + steps]
|
||||
|
|
|
@ -142,6 +142,31 @@ module ApplicationTests
|
|||
end
|
||||
end
|
||||
|
||||
test "migration status after rollback and forward" do
|
||||
Dir.chdir(app_path) do
|
||||
`bin/rails generate model user username:string password:string;
|
||||
bin/rails generate migration add_email_to_users email:string;
|
||||
bin/rails db:migrate`
|
||||
|
||||
output = `bin/rails db:migrate:status`
|
||||
|
||||
assert_match(/up\s+\d{14}\s+Create users/, output)
|
||||
assert_match(/up\s+\d{14}\s+Add email to users/, output)
|
||||
|
||||
`bin/rails db:rollback STEP=2`
|
||||
output = `bin/rails db:migrate:status`
|
||||
|
||||
assert_match(/down\s+\d{14}\s+Create users/, output)
|
||||
assert_match(/down\s+\d{14}\s+Add email to users/, output)
|
||||
|
||||
`bin/rails db:forward STEP=2`
|
||||
output = `bin/rails db:migrate:status`
|
||||
|
||||
assert_match(/up\s+\d{14}\s+Create users/, output)
|
||||
assert_match(/up\s+\d{14}\s+Add email to users/, output)
|
||||
end
|
||||
end
|
||||
|
||||
test "migration status after rollback and redo without timestamps" do
|
||||
add_to_config("config.active_record.timestamped_migrations = false")
|
||||
|
||||
|
|
Loading…
Reference in a new issue