cleanup

globals.go

@@ -25,24 +25,17 @@ func ResetGlobalMigrations() {
 func SetGlobalMigrations(migrations ...Migration) error {
 	for _, migration := range migrations {
 		m := &migration
-		if err := setGoMigration(m); err != nil {
-			return err
+		if _, ok := registeredGoMigrations[m.Version]; ok {
+			return fmt.Errorf("go migration with version %d already registered", m.Version)
+		}
+		if err := checkMigration(m); err != nil {
+			return fmt.Errorf("invalid go migration: %w", err)
 		}
 		registeredGoMigrations[m.Version] = m
 	}
 	return nil
 }
 
-func setGoMigration(m *Migration) error {
-	if _, ok := registeredGoMigrations[m.Version]; ok {
-		return fmt.Errorf("go migration with version %d already registered", m.Version)
-	}
-	if err := checkMigration(m); err != nil {
-		return fmt.Errorf("invalid go migration: %w", err)
-	}
-	return nil
-}
-
 func checkMigration(m *Migration) error {
 	if !m.construct {
 		return errors.New("must use NewGoMigration to construct migrations")

migration.go

@@ -35,13 +35,13 @@ func NewGoMigration(version int64, up, down *GoFunc) Migration {
 	// is registered.
 	if up != nil {
 		if up.RunDB != nil {
-			m.UpFnNoTxContext = up.RunDB // func(context.Context, *sql.DB) error
-			m.UpFnNoTx = func(db *sql.DB) error { return up.RunDB(context.Background(), db) }
+			m.UpFnNoTxContext = up.RunDB          // func(context.Context, *sql.DB) error
+			m.UpFnNoTx = withoutContext(up.RunDB) // func(*sql.DB) error
 		}
 		if up.RunTx != nil {
 			m.UseTx = true
-			m.UpFnContext = up.RunTx // func(context.Context, *sql.Tx) error
-			m.UpFn = func(tx *sql.Tx) error { return up.RunTx(context.Background(), tx) }
+			m.UpFnContext = up.RunTx          // func(context.Context, *sql.Tx) error
+			m.UpFn = withoutContext(up.RunTx) // func(*sql.Tx) error
 		}
 	}
 	if down != nil {

register.go

@@ -74,7 +74,6 @@ func withContext[T any](fn func(T) error) func(context.Context, T) error {
 	if fn == nil {
 		return nil
 	}
-
 	return func(ctx context.Context, t T) error {
 		return fn(t)
 	}