[REF] requested changes

Author: JohnBra

cmd/migration.go

@@ -152,7 +152,7 @@ func init() {
 	migrationCmd.AddCommand(migrationFetchCmd)
 	// Build new command
 	newFlags := migrationNewCmd.Flags()
-	newFlags.BoolVarP(&repeatable, "repeatable", "r", false, "Creates a repeatable migration instead of a common migration.")
+	newFlags.BoolVarP(&repeatable, "repeatable", "r", false, "Creates a repeatable migration instead of a versioned migration.")
 	migrationCmd.AddCommand(migrationNewCmd)
 	rootCmd.AddCommand(migrationCmd)
 }

internal/migration/new/new.go

@@ -12,7 +12,7 @@ import (
 )
 
 func Run(repeatable bool, migrationName string, stdin afero.File, fsys afero.Fs) error {
-	path := ""
+	var path string
 
 	if repeatable {
 		// if migration name already exists, repeatable migration will be overwritten

internal/migration/up/up.go

@@ -24,17 +24,7 @@ func Run(ctx context.Context, includeAll bool, config pgconn.Config, fsys afero.
 		return err
 	}
 
-	err = migration.ApplyMigrations(ctx, pending, conn, afero.NewIOFS(fsys))
-	if err != nil {
-		return err
-	}
-
-	repeatableMigrations, err := migration.ListRepeatableMigrations(utils.MigrationsDir, afero.NewIOFS(fsys))
-	if err != nil {
-		return err
-	}
-
-	return migration.ApplyMigrations(ctx, repeatableMigrations, conn, afero.NewIOFS(fsys))
+	return migration.ApplyMigrations(ctx, pending, conn, afero.NewIOFS(fsys))
 }
 
 func GetPendingMigrations(ctx context.Context, includeAll bool, conn *pgx.Conn, fsys afero.Fs) ([]string, error) {
@@ -56,6 +46,11 @@ func GetPendingMigrations(ctx context.Context, includeAll bool, conn *pgx.Conn,
 		}
 		utils.CmdSuggestion = suggestIgnoreFlag(diff)
 	}
+	repeatableMigrations, err := migration.ListRepeatableMigrations(utils.MigrationsDir, afero.NewIOFS(fsys))
+	if err != nil {
+		return nil, err
+	}
+	diff = append(diff, repeatableMigrations...)
 	return diff, err
 }