# HG changeset patch # User Peter Sanchez # Date 1645106953 21600 # Thu Feb 17 08:09:13 2022 -0600 # Node ID 17b77ed033706d5ec1ac1dc1ca2797172153645b # Parent f13793291c383d91d7b62da23b3eaf906cd210ff Removing export of WithTx, it's not needed. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# migrate +# migrate [![godoc](https://godocs.io/petersanchez.com/migrate?status.svg)](https://godocs.io/petersanchez.com/migrate) Database migrations for your Go project. Supports files, functions, and query migrations. diff --git a/migrate.go b/migrate.go --- a/migrate.go +++ b/migrate.go @@ -181,7 +181,7 @@ func (me *MigrationEngine) getRecord(ctx context.Context, id string) (string, error) { var found string - err := WithTx(ctx, txOptionsRO, func(tx *sql.Tx) error { + err := withTx(ctx, txOptionsRO, func(tx *sql.Tx) error { query := me.rebind("SELECT id FROM migrations WHERE id=?") return tx.QueryRowContext(ctx, query, id).Scan(&found) }) @@ -197,7 +197,7 @@ } func (me *MigrationEngine) createMigrationTable(ctx context.Context) error { - err := WithTx(ctx, nil, func(tx *sql.Tx) error { + err := withTx(ctx, nil, func(tx *sql.Tx) error { _, err := tx.ExecContext(ctx, "CREATE TABLE IF NOT EXISTS migrations (id TEXT PRIMARY KEY)") if err != nil { return fmt.Errorf("creating migrations table: %w", err) @@ -216,7 +216,7 @@ defer cancel() } - err := WithTx(ctx, nil, func(tx *sql.Tx) error { + err := withTx(ctx, nil, func(tx *sql.Tx) error { query := me.rebind("INSERT INTO migrations (id) VALUES (?)") _, err := tx.ExecContext(ctx, query, m.ID) if err != nil { @@ -244,7 +244,7 @@ defer cancel() } - err := WithTx(ctx, nil, func(tx *sql.Tx) error { + err := withTx(ctx, nil, func(tx *sql.Tx) error { query := me.rebind("DELETE FROM migrations WHERE id=?") _, err := tx.ExecContext(ctx, query, m.ID) if err != nil { diff --git a/sql.go b/sql.go --- a/sql.go +++ b/sql.go @@ -80,8 +80,7 @@ return db } -// WithTx calls a function wrapped in a database transaction -func WithTx(ctx context.Context, opts *sql.TxOptions, fn func(tx *sql.Tx) error) error { +func withTx(ctx context.Context, opts *sql.TxOptions, fn func(tx *sql.Tx) error) error { db := dbFromContext(ctx) tx, err := db.BeginTx(ctx, opts) if err != nil {