Prepare statement on an existing transaction (#3144)

This should fix an issue with the database being locked for SQLite.
matrix-org · Jul 7, 2023 · c08c740 · c08c740
1 parent cc9b695
commit c08c740
Showing 1 changed file with 7 additions and 1 deletion.
diff --git 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)
 		}