Panic earlier if context is nil

mautrix · Mar 11, 2024 · 53cb049 · 53cb049
1 parent ff64e13
commit 53cb049
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/dbutil/transaction.go b/dbutil/transaction.go
@@ -46,10 +46,16 @@ func (db *Database) QueryRow(ctx context.Context, query string, args ...any) *sq
 }
 
 func (db *Database) BeginTx(ctx context.Context, opts *sql.TxOptions) (*LoggingTxn, error) {
+	if ctx == nil {
+		panic("BeginTx() called with nil ctx")
+	}
 	return db.LoggingDB.BeginTx(ctx, opts)
 }
 
 func (db *Database) DoTxn(ctx context.Context, opts *sql.TxOptions, fn func(ctx context.Context) error) error {
+	if ctx == nil {
+		panic("DoTxn() called with nil ctx")
+	}
 	if ctx.Value(ContextKeyDatabaseTransaction) != nil {
 		zerolog.Ctx(ctx).Trace().Msg("Already in a transaction, not creating a new one")
 		return fn(ctx)
@@ -123,7 +129,7 @@ func (db *Database) DoTxn(ctx context.Context, opts *sql.TxOptions, fn func(ctx
 
 func (db *Database) Conn(ctx context.Context) Execable {
 	if ctx == nil {
-		return &db.LoggingDB
+		panic("Conn() called with nil ctx")
 	}
 	txn, ok := ctx.Value(ContextKeyDatabaseTransaction).(Transaction)
 	if ok {