From e00293dc415bfb33dba7d6825671165fbd72e015 Mon Sep 17 00:00:00 2001 From: Jake Howell Date: Tue, 28 Jul 2026 11:22:38 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20fix(coderd/database/migrations):?= =?UTF-8?q?=20resolve=20duplicate=20000554=20migration=20collision?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both 000554_aibridge_token_usage_spend_export_index and 000554_legacy_none_login_to_password landed on main with the same version number. Renumber the legacy none login migration to 000555 and update migrate_test.go accordingly. --- ...wn.sql => 000555_legacy_none_login_to_password.down.sql} | 0 ...d.up.sql => 000555_legacy_none_login_to_password.up.sql} | 0 coderd/database/migrations/migrate_test.go | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename coderd/database/migrations/{000554_legacy_none_login_to_password.down.sql => 000555_legacy_none_login_to_password.down.sql} (100%) rename coderd/database/migrations/{000554_legacy_none_login_to_password.up.sql => 000555_legacy_none_login_to_password.up.sql} (100%) diff --git a/coderd/database/migrations/000554_legacy_none_login_to_password.down.sql b/coderd/database/migrations/000555_legacy_none_login_to_password.down.sql similarity index 100% rename from coderd/database/migrations/000554_legacy_none_login_to_password.down.sql rename to coderd/database/migrations/000555_legacy_none_login_to_password.down.sql diff --git a/coderd/database/migrations/000554_legacy_none_login_to_password.up.sql b/coderd/database/migrations/000555_legacy_none_login_to_password.up.sql similarity index 100% rename from coderd/database/migrations/000554_legacy_none_login_to_password.up.sql rename to coderd/database/migrations/000555_legacy_none_login_to_password.up.sql diff --git a/coderd/database/migrations/migrate_test.go b/coderd/database/migrations/migrate_test.go index f7f2ec75616..14119ed81e3 100644 --- a/coderd/database/migrations/migrate_test.go +++ b/coderd/database/migrations/migrate_test.go @@ -1717,10 +1717,10 @@ func TestMigration000546ChatHistoryAPIKeyConstraints(t *testing.T) { } } -func TestMigration000554LegacyNoneLoginToPassword(t *testing.T) { +func TestMigration000555LegacyNoneLoginToPassword(t *testing.T) { t.Parallel() - const priorMigrationVersion = 553 + const priorMigrationVersion = 554 sqlDB := testSQLDB(t) @@ -1772,7 +1772,7 @@ func TestMigration000554LegacyNoneLoginToPassword(t *testing.T) { passwordID, "password-user", "password@test.com", []byte("hashed"), now, now, "active", pq.StringArray{}, "password", false, false) require.NoError(t, err) - migrationSQL, err := os.ReadFile("000554_legacy_none_login_to_password.up.sql") + migrationSQL, err := os.ReadFile("000555_legacy_none_login_to_password.up.sql") require.NoError(t, err) _, err = sqlDB.ExecContext(ctx, string(migrationSQL)) require.NoError(t, err)