From 43a2be15d5b7c7bf3746cd5d7088143efae9b6a1 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Tue, 13 Jun 2023 08:49:19 +0000
Subject: [PATCH] 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.
---
 database/middleware.go | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/database/middleware.go b/database/middleware.go
index 364a9554c7da8b676ce86e885370fd2a86f00ae5..adbf56bf0852e5984251d349349ac5e12242f1ab 100644
--- a/database/middleware.go
+++ b/database/middleware.go
@@ -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
 	}