fix: don't lock migrations when running Migrate and Rollback

uptrace · Nov 9, 2022 · 69a7354 · 69a7354
1 parent b808afb
commit 69a7354
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/example/migrate/main.go b/example/migrate/main.go
@@ -58,6 +58,11 @@ func newDBCommand(migrator *migrate.Migrator) *cli.Command {
 				Name:  "migrate",
 				Usage: "migrate database",
 				Action: func(c *cli.Context) error {
+					if err := migrator.Lock(c.Context); err != nil {
+						return err
+					}
+					defer migrator.Unlock(c.Context) //nolint:errcheck
+
 					group, err := migrator.Migrate(c.Context)
 					if err != nil {
 						return err
@@ -74,6 +79,11 @@ func newDBCommand(migrator *migrate.Migrator) *cli.Command {
 				Name:  "rollback",
 				Usage: "rollback the last migration group",
 				Action: func(c *cli.Context) error {
+					if err := migrator.Lock(c.Context); err != nil {
+						return err
+					}
+					defer migrator.Unlock(c.Context) //nolint:errcheck
+
 					group, err := migrator.Rollback(c.Context)
 					if err != nil {
 						return err

diff --git a/migrate/migrator.go b/migrate/migrator.go
@@ -136,11 +136,6 @@ func (m *Migrator) Migrate(ctx context.Context, opts ...MigrationOption) (*Migra
 		return nil, err
 	}
 
-	if err := m.Lock(ctx); err != nil {
-		return nil, err
-	}
-	defer m.Unlock(ctx) //nolint:errcheck
-
 	migrations, lastGroupID, err := m.migrationsWithStatus(ctx)
 	if err != nil {
 		return nil, err
@@ -188,11 +183,6 @@ func (m *Migrator) Rollback(ctx context.Context, opts ...MigrationOption) (*Migr
 		return nil, err
 	}
 
-	if err := m.Lock(ctx); err != nil {
-		return nil, err
-	}
-	defer m.Unlock(ctx) //nolint:errcheck
-
 	migrations, err := m.MigrationsWithStatus(ctx)
 	if err != nil {
 		return nil, err