# HG changeset patch
# User Peter Sanchez <peter@netlandish.com>
# Date 1701304558 21600
#      Wed Nov 29 18:35:58 2023 -0600
# Node ID 2918b21f23b4ddda3a426a20c57c5e20c70c1c23
# Parent  d2228167b97dd4737b7c18b44ead1edfe1a609cd
Adding contextDeadlineExceeded check to WithTx

diff --git a/database/sql.go b/database/sql.go
--- a/database/sql.go
+++ b/database/sql.go
@@ -58,7 +58,8 @@
 		txErr = tx.Commit()
 	}
 
-	if errors.Is(err, context.Canceled) && errors.Is(txErr, sqldriver.ErrBadConn) {
+	if (errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded)) &&
+		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