fix: remove WithDumpMigrations option to MigrationBox

alnr · ory-bot · commit 7ee85fb985b0 · 2026-02-03T18:37:57.000Z
GitOrigin-RevId: ec8bf6fb2d78337c71a158ba2f65dfe2e2d612f6
diff --git a/oryx/popx/migration_box.go b/oryx/popx/migration_box.go
@@ -30,7 +30,6 @@ type (
 		migrationsUp        Migrations
 		migrationsDown      Migrations
 		perMigrationTimeout time.Duration
-		dumpMigrations      bool
 		l                   *logrusx.Logger
 		migrationContent    MigrationContent
 	}
@@ -77,12 +76,6 @@ func WithPerMigrationTimeout(timeout time.Duration) MigrationBoxOption {
 	}
 }
 
-func WithDumpMigrations() MigrationBoxOption {
-	return func(m *MigrationBox) {
-		m.dumpMigrations = true
-	}
-}
-
 // WithTestdata adds testdata to the migration box.
 func WithTestdata(t *testing.T, testdata fs.FS) MigrationBoxOption {
 	testdataPattern := regexp.MustCompile(`^(\d+)_testdata(|\.[a-zA-Z0-9]+).sql$`)
diff --git a/oryx/popx/migrator.go b/oryx/popx/migrator.go
@@ -471,7 +471,7 @@ func (mb *MigrationBox) Status(ctx context.Context) (MigrationStatuses, error) {
 func (mb *MigrationBox) DumpMigrationSchema(ctx context.Context) error {
 	c := mb.c.WithContext(ctx)
 	schema := "schema.sql"
-	f, err := os.Create(schema) //#nosec:G304) //#nosec:G304
+	f, err := os.Create(schema) //#nosec:G304
 	if err != nil {
 		return errors.WithStack(err)
 	}
@@ -485,15 +485,6 @@ func (mb *MigrationBox) DumpMigrationSchema(ctx context.Context) error {
 
 func (mb *MigrationBox) exec(ctx context.Context, fn func() error) error {
 	now := time.Now()
-	defer func() {
-		if !mb.dumpMigrations {
-			return
-		}
-		err := mb.DumpMigrationSchema(ctx)
-		if err != nil {
-			mb.l.WithError(err).Error("Migrator: unable to dump schema")
-		}
-	}()
 	defer mb.printTimer(now)
 
 	err := mb.CreateSchemaMigrations(ctx)
diff --git a/persistence/sql/migratest/migration_test.go b/persistence/sql/migratest/migration_test.go
@@ -127,11 +127,15 @@ func testDatabase(t *testing.T, db string, c *pop.Connection) {
 		c, l,
 		popx.WithGoMigrations(gomigrations.All),
 		popx.WithTestdata(t, os.DirFS("./testdata")),
-		popx.WithDumpMigrations(),
 	)
 	require.NoError(t, err)
-	require.NoError(t, tm.Up(ctx))
-	// t.Skip() // uncomment to get the current state of the database after the migrations have run
+
+	err = tm.Up(ctx) // for easy breakpointing
+	// _ = tm.DumpMigrationSchema(ctx) // uncomment to get the current state of the database after migrations have run
+	if !assert.NoError(t, err) {
+		assert.NoError(t, tm.DumpMigrationSchema(ctx))
+		t.FailNow()
+	}
 
 	t.Run("suite=fixtures", func(t *testing.T) {
 		t.Cleanup(func() {
@@ -477,5 +481,8 @@ func testDatabase(t *testing.T, db string, c *pop.Connection) {
 	})
 
 	err = tm.Down(ctx, -1) // for easy breakpointing
-	require.NoError(t, err)
+	if !assert.NoError(t, err) {
+		assert.NoError(t, tm.DumpMigrationSchema(ctx))
+		t.FailNow()
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ type (`
`30`	`30`	`migrationsUp Migrations`
`31`	`31`	`migrationsDown Migrations`
`32`	`32`	`perMigrationTimeout time.Duration`
`33`		`- dumpMigrations bool`
`34`	`33`	`l *logrusx.Logger`
`35`	`34`	`migrationContent MigrationContent`
`36`	`35`	`}`
`@@ -77,12 +76,6 @@ func WithPerMigrationTimeout(timeout time.Duration) MigrationBoxOption {`
`77`	`76`	`}`
`78`	`77`	`}`
`79`	`78`
`80`		`-func WithDumpMigrations() MigrationBoxOption {`
`81`		`- return func(m *MigrationBox) {`
`82`		`- m.dumpMigrations = true`
`83`		`- }`
`84`		`-}`
`85`		`-`
`86`	`79`	`// WithTestdata adds testdata to the migration box.`
`87`	`80`	`func WithTestdata(t *testing.T, testdata fs.FS) MigrationBoxOption {`
`88`	`81`	testdataPattern := regexp.MustCompile(`^(\d+)_testdata(\|\.[a-zA-Z0-9]+).sql$`)