Jun 5, 2025 · Jun 5, 2025
diff --git a/cli/clitest/clitest.go b/cli/clitest/clitest.go
 switch {
 case errors.Is(err, context.Canceled):
 return
 case err != nil && strings.Contains(err.Error(), "driver: bad connection"):
 // When we cancel the context on a query that's being executed within
 // a transaction, sometimes, instead of a context.Canceled error we get
 // a "driver: bad connection" error.
 // https://github.com/lib/pq/issues/1137
 return
 default:
 assert.NoError(t, err)
 }
diff --git a/cli/server.go b/cli/server.go
 if err != nil {
 return nil, xerrors.Errorf("get postgres version: %w", err)
 }
 defer version.Close()
 if version.Err() != nil {
 return nil, xerrors.Errorf("version select: %w", version.Err())
 }
 if !version.Next() {
 return nil, xerrors.Errorf("no rows returned for version select")
 }
 if err != nil {
 return nil, xerrors.Errorf("scan version: %w", err)
 }
 _ = version.Close()

 if versionNum < 130000 {
 return nil, xerrors.Errorf("PostgreSQL version must be v13.0.0 or higher! Got: %d", versionNum)
diff --git a/coderd/database/pubsub/pubsub.go b/coderd/database/pubsub/pubsub.go
 sentErrCh = true
 }),
 }
 select {
 case err = <-errCh:
 if err != nil {
 _ = p.pgListener.Close()
 return xerrors.Errorf("create pq listener: %w", err)
 }
 case <-ctx.Done():
 // We don't respect context cancellation here. There's a bug in the pq library
 // where if you close the listener before or while the connection is being
 // established, the connection will be established anyway, and will not be
 // closed.
 // https://github.com/lib/pq/issues/1192
 if err := <-errCh; err != nil {
 _ = p.pgListener.Close()
 returnctx.Err()
 returnxerrors.Errorf("create pq listener: %w", err)
 }
 return nil
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -168,6 +168,12 @@ func StartWithAssert(t testing.T, inv serpent.Invocation, assertCallback func(
		switch {
		case errors.Is(err, context.Canceled):
		return
		case err != nil && strings.Contains(err.Error(), "driver: bad connection"):
		// When we cancel the context on a query that's being executed within
		// a transaction, sometimes, instead of a context.Canceled error we get
		// a "driver: bad connection" error.
		// https://github.com/lib/pq/issues/1137
		return
		default:
		assert.NoError(t, err)
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2359,6 +2359,10 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
		if err != nil {
		return nil, xerrors.Errorf("get postgres version: %w", err)
		}
		defer version.Close()
		if version.Err() != nil {
		return nil, xerrors.Errorf("version select: %w", version.Err())
		}
		if !version.Next() {
		return nil, xerrors.Errorf("no rows returned for version select")
		}
Expand All		@@ -2367,7 +2371,6 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
		if err != nil {
		return nil, xerrors.Errorf("scan version: %w", err)
		}
		_ = version.Close()

		if versionNum < 130000 {
		return nil, xerrors.Errorf("PostgreSQL version must be v13.0.0 or higher! Got: %d", versionNum)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -552,15 +552,14 @@ func (p *PGPubsub) startListener(ctx context.Context, connectURL string) error {
		sentErrCh = true
		}),
		}
		select {
		case err = <-errCh:
		if err != nil {
		_ = p.pgListener.Close()
		return xerrors.Errorf("create pq listener: %w", err)
		}
		case <-ctx.Done():
		// We don't respect context cancellation here. There's a bug in the pq library
		// where if you close the listener before or while the connection is being
		// established, the connection will be established anyway, and will not be
		// closed.
		// https://github.com/lib/pq/issues/1192
		if err := <-errCh; err != nil {
		_ = p.pgListener.Close()
		returnctx.Err()
		returnxerrors.Errorf("create pq listener: %w", err)
		}
		return nil
		}
Expand Down