From c08c7405dbe9d88c1364f6f1f2466db5045506cc Mon Sep 17 00:00:00 2001
From: Till <2353100+S7evinK@users.noreply.github.com>
Date: Fri, 7 Jul 2023 13:09:39 +0200
Subject: Prepare statement on an existing transaction (#3144)

This should fix an issue with the database being locked for SQLite.
---
 internal/sqlutil/migrate.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'internal')

diff --git a/internal/sqlutil/migrate.go b/internal/sqlutil/migrate.go
index a66a7582..735fb492 100644
--- a/internal/sqlutil/migrate.go
+++ b/internal/sqlutil/migrate.go
@@ -112,7 +112,13 @@ func (m *Migrator) Up(ctx context.Context) error {
 
 func (m *Migrator) insertMigration(ctx context.Context, txn *sql.Tx, migrationName string) error {
 	if m.insertStmt == nil {
-		stmt, err := m.db.Prepare(insertVersionSQL)
+		var stmt *sql.Stmt
+		var err error
+		if txn == nil {
+			stmt, err = m.db.PrepareContext(ctx, insertVersionSQL)
+		} else {
+			stmt, err = txn.PrepareContext(ctx, insertVersionSQL)
+		}
 		if err != nil {
 			return fmt.Errorf("unable to prepare insert statement: %w", err)
 		}
-- 
cgit v1.2.3