From 70b6353918dae5f88042b2045affa171d2736369 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Sep 2022 09:22:46 +0000 Subject: [PATCH] build(deps): bump github.com/jackc/pgx/v4 from 4.17.1 to 4.17.2 Bumps [github.com/jackc/pgx/v4](https://github.com/jackc/pgx) from 4.17.1 to 4.17.2. - [Release notes](https://github.com/jackc/pgx/releases) - [Changelog](https://github.com/jackc/pgx/blob/master/CHANGELOG.md) - [Commits](https://github.com/jackc/pgx/compare/v4.17.1...v4.17.2) --- updated-dependencies: - dependency-name: github.com/jackc/pgx/v4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/jackc/pgx/v4/CHANGELOG.md | 4 ++++ vendor/github.com/jackc/pgx/v4/conn.go | 1 + vendor/modules.txt | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d2be2fc26..b591b5af6 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/gophercloud/gophercloud v1.0.0 github.com/hashicorp/go-retryablehttp v0.7.1 github.com/jackc/pgtype v1.12.0 - github.com/jackc/pgx/v4 v4.17.1 + github.com/jackc/pgx/v4 v4.17.2 github.com/julienschmidt/httprouter v1.3.0 github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b github.com/labstack/echo/v4 v4.8.0 diff --git a/go.sum b/go.sum index 11333bae8..1c8531b1d 100644 --- a/go.sum +++ b/go.sum @@ -1007,8 +1007,8 @@ github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQ github.com/jackc/pgx/v4 v4.6.0/go.mod h1:vPh43ZzxijXUVJ+t/EmXBtFmbFVO72cuneCT9oAlxAg= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= github.com/jackc/pgx/v4 v4.16.0/go.mod h1:N0A9sFdWzkw/Jy1lwoiB64F2+ugFZi987zRxcPez/wI= -github.com/jackc/pgx/v4 v4.17.1 h1:tASdE79tX9LOQu3MMvioWT6YaZkf58ZhmLHhV4sv5WM= -github.com/jackc/pgx/v4 v4.17.1/go.mod h1:lcxIZN44yMIrWI78a5CpucdD14hX0SBDbNRvjDBItsw= +github.com/jackc/pgx/v4 v4.17.2 h1:0Ut0rpeKwvIVbMQ1KbMBU4h6wxehBI535LK6Flheh8E= +github.com/jackc/pgx/v4 v4.17.2/go.mod h1:lcxIZN44yMIrWI78a5CpucdD14hX0SBDbNRvjDBItsw= github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= diff --git a/vendor/github.com/jackc/pgx/v4/CHANGELOG.md b/vendor/github.com/jackc/pgx/v4/CHANGELOG.md index 007ba5c07..e8f201295 100644 --- a/vendor/github.com/jackc/pgx/v4/CHANGELOG.md +++ b/vendor/github.com/jackc/pgx/v4/CHANGELOG.md @@ -1,3 +1,7 @@ +# 4.17.2 (September 3, 2022) + +* Fix panic when logging batch error (Tom Mòˆller) + # 4.17.1 (August 27, 2022) * Upgrade puddle to v1.3.0 - fixes context failing to cancel Acquire when acquire is creating resource which was introduced in v4.17.0 (James Hartig) diff --git a/vendor/github.com/jackc/pgx/v4/conn.go b/vendor/github.com/jackc/pgx/v4/conn.go index 08b31fd17..854561e02 100644 --- a/vendor/github.com/jackc/pgx/v4/conn.go +++ b/vendor/github.com/jackc/pgx/v4/conn.go @@ -820,6 +820,7 @@ func (c *Conn) logBatchResults(ctx context.Context, startTime time.Time, results endTime := time.Now() c.log(ctx, LogLevelError, "SendBatch", map[string]interface{}{"err": results.err, "time": endTime.Sub(startTime)}) } + return results } if c.shouldLog(LogLevelInfo) { diff --git a/vendor/modules.txt b/vendor/modules.txt index 8368f82f4..86365535a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -376,7 +376,7 @@ github.com/jackc/pgservicefile # github.com/jackc/pgtype v1.12.0 ## explicit github.com/jackc/pgtype -# github.com/jackc/pgx/v4 v4.17.1 +# github.com/jackc/pgx/v4 v4.17.2 ## explicit github.com/jackc/pgx/v4 github.com/jackc/pgx/v4/internal/sanitize