~bigbes/core-go: database/middleware: don't use sql.Conn in WithTx

43a2be15d5b7c7bf3746cd5d7088143efae9b6a1 — Simon Ser 3 years ago 6f6bb87

database/middleware: don't use sql.Conn in WithTx

We can just use sql.DB instead of sql.Conn here. Simplifies the
code and reduces the risk of getting "bad connection" errors.

patch browse .tar.gz .zip

1 files changed, 2 insertions(+), 6 deletions(-)

M database/middleware.go

M database/middleware.go => database/middleware.go +2 -6

@@ 44,12 44,8 @@ func DBForContext(ctx context.Context) *sql.DB {
 }
 
 func WithTx(ctx context.Context, opts *sql.TxOptions, fn func(tx *sql.Tx) error) error {
-	conn, err := ForContext(ctx)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-	tx, err := conn.BeginTx(ctx, opts)
+	db := DBForContext(ctx)
+	tx, err := db.BeginTx(ctx, opts)
 	if err != nil {
 		return err
 	}