1 files changed, 61 insertions, 57 deletions

diff --git a/vendor/github.com/uptrace/bun/migrate/migration.go b/vendor/github.com/uptrace/bun/migrate/migration.go
index a581098a3..6f395b7b4 100644
--- a/vendor/github.com/uptrace/bun/migrate/migration.go
+++ b/vendor/github.com/uptrace/bun/migrate/migration.go
@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"io"
 	"io/fs"
 	"sort"
 	"strings"
@@ -38,83 +39,86 @@ type MigrationFunc func(ctx context.Context, db *bun.DB) error
 
 func NewSQLMigrationFunc(fsys fs.FS, name string) MigrationFunc {
 	return func(ctx context.Context, db *bun.DB) error {
-		isTx := strings.HasSuffix(name, ".tx.up.sql") || strings.HasSuffix(name, ".tx.down.sql")
-
 		f, err := fsys.Open(name)
 		if err != nil {
 			return err
 		}
 
-		scanner := bufio.NewScanner(f)
-		var queries []string
+		isTx := strings.HasSuffix(name, ".tx.up.sql") || strings.HasSuffix(name, ".tx.down.sql")
+		return Exec(ctx, db, f, isTx)
+	}
+}
 
-		var query []byte
-		for scanner.Scan() {
-			b := scanner.Bytes()
+// Exec reads and executes the SQL migration in the f.
+func Exec(ctx context.Context, db *bun.DB, f io.Reader, isTx bool) error {
+	scanner := bufio.NewScanner(f)
+	var queries []string
 
-			const prefix = "--bun:"
-			if bytes.HasPrefix(b, []byte(prefix)) {
-				b = b[len(prefix):]
-				if bytes.Equal(b, []byte("split")) {
-					queries = append(queries, string(query))
-					query = query[:0]
-					continue
-				}
-				return fmt.Errorf("bun: unknown directive: %q", b)
-			}
+	var query []byte
+	for scanner.Scan() {
+		b := scanner.Bytes()
 
-			query = append(query, b...)
-			query = append(query, '\n')
+		const prefix = "--bun:"
+		if bytes.HasPrefix(b, []byte(prefix)) {
+			b = b[len(prefix):]
+			if bytes.Equal(b, []byte("split")) {
+				queries = append(queries, string(query))
+				query = query[:0]
+				continue
+			}
+			return fmt.Errorf("bun: unknown directive: %q", b)
 		}
 
-		if len(query) > 0 {
-			queries = append(queries, string(query))
+		query = append(query, b...)
+		query = append(query, '\n')
+	}
+
+	if len(query) > 0 {
+		queries = append(queries, string(query))
+	}
+	if err := scanner.Err(); err != nil {
+		return err
+	}
+
+	var idb bun.IConn
+
+	if isTx {
+		tx, err := db.BeginTx(ctx, nil)
+		if err != nil {
+			return err
 		}
-		if err := scanner.Err(); err != nil {
+		idb = tx
+	} else {
+		conn, err := db.Conn(ctx)
+		if err != nil {
 			return err
 		}
+		idb = conn
+	}
 
-		var idb bun.IConn
+	var retErr error
 
-		if isTx {
-			tx, err := db.BeginTx(ctx, nil)
-			if err != nil {
-				return err
-			}
-			idb = tx
-		} else {
-			conn, err := db.Conn(ctx)
-			if err != nil {
-				return err
-			}
-			idb = conn
+	defer func() {
+		if tx, ok := idb.(bun.Tx); ok {
+			retErr = tx.Commit()
+			return
 		}
 
-		var retErr error
-
-		defer func() {
-			if tx, ok := idb.(bun.Tx); ok {
-				retErr = tx.Commit()
-				return
-			}
-
-			if conn, ok := idb.(bun.Conn); ok {
-				retErr = conn.Close()
-				return
-			}
+		if conn, ok := idb.(bun.Conn); ok {
+			retErr = conn.Close()
+			return
+		}
 
-			panic("not reached")
-		}()
+		panic("not reached")
+	}()
 
-		for _, q := range queries {
-			_, err = idb.ExecContext(ctx, q)
-			if err != nil {
-				return err
-			}
+	for _, q := range queries {
+		if _, err := idb.ExecContext(ctx, q); err != nil {
+			return err
 		}
-
-		return retErr
 	}
+
+	return retErr
 }
 
 const goTemplate = `package %s
@@ -167,7 +171,7 @@ func (ms MigrationSlice) String() string {
 		if i > 0 {
 			sb.WriteString(", ")
 		}
-		sb.WriteString(ms[i].Name)
+		sb.WriteString(ms[i].String())
 	}
 
 	return sb.String()