From 1f1c73b38edfcabebdca527bc2225f9fe044e368 Mon Sep 17 00:00:00 2001 From: Vladimir Mihailenco Date: Mon, 27 Jun 2022 10:01:23 +0300 Subject: [PATCH] chore: cleanup --- chmigrate/migrator.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/chmigrate/migrator.go b/chmigrate/migrator.go index f4a3f98..21a56e9 100644 --- a/chmigrate/migrator.go +++ b/chmigrate/migrator.go @@ -29,9 +29,9 @@ func WithLocksTableName(table string) MigratorOption { // WithMarkAppliedOnSuccess sets the migrator to only mark migrations as applied/unapplied // when their up/down is successful -func WithMarkAppliedOnSuccess() MigratorOption { +func WithMarkAppliedOnSuccess(enabled bool) MigratorOption { return func(m *Migrator) { - m.markAppliedOnSuccess = true + m.markAppliedOnSuccess = enabled } } @@ -145,10 +145,9 @@ func (m *Migrator) Migrate(ctx context.Context, opts ...MigrationOption) (*Migra if err != nil { return nil, err } + migrations = migrations.Unapplied() - group := &MigrationGroup{ - Migrations: migrations.Unapplied(), - } + group := new(MigrationGroup) if len(group.Migrations) == 0 { return group, nil } @@ -164,6 +163,8 @@ func (m *Migrator) Migrate(ctx context.Context, opts ...MigrationOption) (*Migra } } + group.Migrations = migrations[:i+1] + if !cfg.nop && migration.Up != nil { if err := migration.Up(ctx, m.db); err != nil { return group, err