# HG changeset patch # User Peter Sanchez # Date 1692211523 21600 # Wed Aug 16 12:45:23 2023 -0600 # Node ID a03742dcfd4a8fe16919eb0d959c853c7aa795e2 # Parent 1ec13a9b75d0729ad8c4d3cb60592268bab9249a When a query fails because the context has been canceled, pq will return "driver: bad connection" from tx.Rollback. Do not panic in this case. See https://github.com/lib/pq/issues/1137 Taken from this sourcehut patch submission: https://lists.sr.ht/~sircmpwn/sr.ht-dev/patches/43630 diff --git a/database/sql.go b/database/sql.go --- a/database/sql.go +++ b/database/sql.go @@ -3,6 +3,7 @@ import ( "context" "database/sql" + sqldriver "database/sql/driver" "errors" "time" @@ -18,7 +19,7 @@ } // TxOptionsRO read only transaction rules -var TxOptionsRO *sql.TxOptions = &sql.TxOptions{Isolation: 0, ReadOnly: true} +var TxOptionsRO = &sql.TxOptions{Isolation: 0, ReadOnly: true} // ContextWithTimeout returns a context with query timeout func ContextWithTimeout( @@ -49,17 +50,24 @@ } defer tx.Rollback() err = fn(tx) + + var txErr error if err != nil { - err := tx.Rollback() - if err != nil && err != sql.ErrTxDone { - panic(err) - } + txErr = tx.Rollback() } else { - err := tx.Commit() - if err != nil && err != sql.ErrTxDone { - panic(err) - } + txErr = tx.Commit() } + + if errors.Is(err, context.Canceled) && errors.Is(txErr, sqldriver.ErrBadConn) { + // When a query fails because the context has been canceled, pq will + // return "driver: bad connection" from tx.Rollback. Do not panic in + // this case. See https://github.com/lib/pq/issues/1137 + return err + } + if txErr != nil && txErr != sql.ErrTxDone { + panic(err) + } + return err }