Skip to content

Commit b77d2aa

Browse files
committed
Fix bin/rails db:forward first migration
1 parent c324f5d commit b77d2aa

File tree

3 files changed

+36
-1
lines changed

3 files changed

+36
-1
lines changed

activerecord/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* Fix `bin/rails db:forward` first migration.
2+
3+
*bogdanvlviv*
4+
15
* Support Descending Indexes for MySQL.
26

37
MySQL 8.0.1 and higher supports descending indexes: `DESC` in an index definition is no longer ignored.

activerecord/lib/active_record/migration.rb

+7-1
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,13 @@ def migration_files(paths)
11041104

11051105
def move(direction, migrations_paths, steps)
11061106
migrator = new(direction, migrations(migrations_paths))
1107-
start_index = migrator.migrations.index(migrator.current_migration)
1107+
1108+
start_index =
1109+
if current_version == 0
1110+
0
1111+
else
1112+
migrator.migrations.index(migrator.current_migration)
1113+
end
11081114

11091115
if start_index
11101116
finish = migrator.migrations[start_index + steps]

railties/test/application/rake/migrations_test.rb

+25
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,31 @@ class AMigration < ActiveRecord::Migration::Current
142142
end
143143
end
144144

145+
test "migration status after rollback and forward" do
146+
Dir.chdir(app_path) do
147+
`bin/rails generate model user username:string password:string;
148+
bin/rails generate migration add_email_to_users email:string;
149+
bin/rails db:migrate`
150+
151+
output = `bin/rails db:migrate:status`
152+
153+
assert_match(/up\s+\d{14}\s+Create users/, output)
154+
assert_match(/up\s+\d{14}\s+Add email to users/, output)
155+
156+
`bin/rails db:rollback STEP=2`
157+
output = `bin/rails db:migrate:status`
158+
159+
assert_match(/down\s+\d{14}\s+Create users/, output)
160+
assert_match(/down\s+\d{14}\s+Add email to users/, output)
161+
162+
`bin/rails db:forward STEP=2`
163+
output = `bin/rails db:migrate:status`
164+
165+
assert_match(/up\s+\d{14}\s+Create users/, output)
166+
assert_match(/up\s+\d{14}\s+Add email to users/, output)
167+
end
168+
end
169+
145170
test "migration status after rollback and redo without timestamps" do
146171
add_to_config("config.active_record.timestamped_migrations = false")
147172

0 commit comments

Comments
 (0)