Skip to content

Commit a011761

Browse files
authored
Merge pull request gastownhall#4224 from maphew/release/fix-duplicate-migration-versions
fix(schema): renumber duplicate release migrations
2 parents ff2f615 + 34936e2 commit a011761

7 files changed

Lines changed: 8 additions & 8 deletions

cmd/bd/auto_import_upgrade_unit_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ func TestMaybeAutoImportJSONL_FailedImportStampPreventsRepeatedImport(t *testing
190190
count := swapFallbackImporter(t, errors.New("test importer failed"))
191191

192192
store := &fakeFallbackStore{statsTotalIssues: 0}
193-
maybeAutoImportJSONL(context.Background(), store, dir, false)
194-
maybeAutoImportJSONL(context.Background(), store, dir, false)
193+
maybeAutoImportJSONL(context.Background(), store, dir)
194+
maybeAutoImportJSONL(context.Background(), store, dir)
195195

196196
if got := count.Load(); got != 1 {
197197
t.Fatalf("fallback importer invoked %d time(s), want 1 for unchanged JSONL after failed attempt stamp", got)
@@ -210,8 +210,8 @@ func TestMaybeAutoImportJSONL_SuccessStampPreventsRepeatedImport(t *testing.T) {
210210
t.Cleanup(func() { fallbackImporter = orig })
211211

212212
store := &fakeFallbackStore{statsTotalIssues: 0}
213-
maybeAutoImportJSONL(context.Background(), store, dir, false)
214-
maybeAutoImportJSONL(context.Background(), store, dir, false)
213+
maybeAutoImportJSONL(context.Background(), store, dir)
214+
maybeAutoImportJSONL(context.Background(), store, dir)
215215

216216
if got := count.Load(); got != 1 {
217217
t.Fatalf("fallback importer invoked %d time(s), want 1 for unchanged JSONL after success stamp", got)
@@ -230,11 +230,11 @@ func TestMaybeAutoImportJSONL_ChangedJSONLBypassesSuccessStamp(t *testing.T) {
230230
t.Cleanup(func() { fallbackImporter = orig })
231231

232232
store := &fakeFallbackStore{statsTotalIssues: 0}
233-
maybeAutoImportJSONL(context.Background(), store, dir, false)
233+
maybeAutoImportJSONL(context.Background(), store, dir)
234234
if err := os.WriteFile(filepath.Join(dir, "issues.jsonl"), []byte(`{"_type":"issue","id":"unit-2","title":"changed","status":"open","priority":2,"issue_type":"task"}`+"\n"), 0o600); err != nil {
235235
t.Fatal(err)
236236
}
237-
maybeAutoImportJSONL(context.Background(), store, dir, false)
237+
maybeAutoImportJSONL(context.Background(), store, dir)
238238

239239
if got := count.Load(); got != 2 {
240240
t.Fatalf("fallback importer invoked %d time(s), want 2 after JSONL changed", got)

cmd/bd/create_proxied_server_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ func TestBuildCreateIssueFromInput_PopulatesAllFields(t *testing.T) {
6161
if got.Priority != 1 {
6262
t.Errorf("Priority = %d", got.Priority)
6363
}
64-
if got.Status != types.StatusOpen {
65-
t.Errorf("Status = %q, want %q", got.Status, types.StatusOpen)
64+
if got.Status != types.StatusDeferred {
65+
t.Errorf("Status = %q, want %q", got.Status, types.StatusDeferred)
6666
}
6767
if got.ExternalRef == nil || *got.ExternalRef != "gh-9" {
6868
t.Errorf("ExternalRef = %v, want pointer to gh-9", got.ExternalRef)

internal/storage/schema/migrations/0044_widen_event_value_columns.down.sql renamed to internal/storage/schema/migrations/0048_widen_event_value_columns.down.sql

File renamed without changes.

internal/storage/schema/migrations/0044_widen_event_value_columns.up.sql renamed to internal/storage/schema/migrations/0048_widen_event_value_columns.up.sql

File renamed without changes.

internal/storage/schema/migrations/0046_longtext_large_content_columns.down.sql renamed to internal/storage/schema/migrations/0049_longtext_large_content_columns.down.sql

File renamed without changes.

internal/storage/schema/migrations/0046_longtext_large_content_columns.up.sql renamed to internal/storage/schema/migrations/0049_longtext_large_content_columns.up.sql

File renamed without changes.

internal/storage/schema/migrations/ignored/0005_widen_wisp_event_value_columns.up.sql renamed to internal/storage/schema/migrations/ignored/0008_widen_wisp_event_value_columns.up.sql

File renamed without changes.

0 commit comments

Comments
 (0)