From d943cc40d206cddc998786ea831ad91583b3c21b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 04:17:04 +0000 Subject: [PATCH] Bump github.com/pashagolub/pgxmock/v4 from 4.4.0 to 4.5.0 Bumps [github.com/pashagolub/pgxmock/v4](https://github.com/pashagolub/pgxmock) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/pashagolub/pgxmock/releases) - [Commits](https://github.com/pashagolub/pgxmock/compare/v4.4.0...v4.5.0) --- updated-dependencies: - dependency-name: github.com/pashagolub/pgxmock/v4 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/pashagolub/pgxmock/v4/pgxmock.go | 10 +++++++++- vendor/github.com/pashagolub/pgxmock/v4/query.go | 7 +++++++ vendor/modules.txt | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 3d18d98e..12b4bc6c 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/jackc/pgx/v5 v5.7.2 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 - github.com/pashagolub/pgxmock/v4 v4.4.0 + github.com/pashagolub/pgxmock/v4 v4.5.0 github.com/prometheus/client_golang v1.20.5 github.com/prometheus/client_model v0.6.1 github.com/rs/zerolog v1.33.0 diff --git a/go.sum b/go.sum index df91dc54..527c38ef 100644 --- a/go.sum +++ b/go.sum @@ -133,8 +133,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= -github.com/pashagolub/pgxmock/v4 v4.4.0 h1:zrZHBzqlzIFrq5Iw6nQpmpEd77eLqGIC2ol4ZTeojz0= -github.com/pashagolub/pgxmock/v4 v4.4.0/go.mod h1:9VoVHXwS3XR/yPtKGzwQvwZX1kzGB9sM8SviDcHDa3A= +github.com/pashagolub/pgxmock/v4 v4.5.0 h1:l2nGpTiX0Yi62z+I69HOXYXRewkAM19bVYFsp5nhpeM= +github.com/pashagolub/pgxmock/v4 v4.5.0/go.mod h1:9VoVHXwS3XR/yPtKGzwQvwZX1kzGB9sM8SviDcHDa3A= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/vendor/github.com/pashagolub/pgxmock/v4/pgxmock.go b/vendor/github.com/pashagolub/pgxmock/v4/pgxmock.go index 5cd2b94f..d3716e06 100644 --- a/vendor/github.com/pashagolub/pgxmock/v4/pgxmock.go +++ b/vendor/github.com/pashagolub/pgxmock/v4/pgxmock.go @@ -326,7 +326,7 @@ func (c *pgxmock) Conn() *pgx.Conn { panic("Conn() is not available in pgxmock") } -func (c *pgxmock) CopyFrom(ctx context.Context, tableName pgx.Identifier, columnNames []string, _ pgx.CopyFromSource) (int64, error) { +func (c *pgxmock) CopyFrom(ctx context.Context, tableName pgx.Identifier, columnNames []string, rowSrc pgx.CopyFromSource) (int64, error) { ex, err := findExpectationFunc[*ExpectedCopyFrom](c, "BeginTx()", func(copyExp *ExpectedCopyFrom) error { if !reflect.DeepEqual(copyExp.expectedTableName, tableName) { return fmt.Errorf("CopyFrom: table name '%s' was not expected, expected table name is '%s'", tableName, copyExp.expectedTableName) @@ -339,6 +339,14 @@ func (c *pgxmock) CopyFrom(ctx context.Context, tableName pgx.Identifier, column if err != nil { return -1, err } + for rowSrc.Next() { + if _, err := rowSrc.Values(); err != nil { + return ex.rowsAffected, err + } + if rowSrc.Err() != nil { + return ex.rowsAffected, rowSrc.Err() + } + } return ex.rowsAffected, ex.waitForDelay(ctx) } diff --git a/vendor/github.com/pashagolub/pgxmock/v4/query.go b/vendor/github.com/pashagolub/pgxmock/v4/query.go index 7e5e1af2..ef48e220 100644 --- a/vendor/github.com/pashagolub/pgxmock/v4/query.go +++ b/vendor/github.com/pashagolub/pgxmock/v4/query.go @@ -66,3 +66,10 @@ var QueryMatcherEqual QueryMatcher = QueryMatcherFunc(func(expectedSQL, actualSQ } return nil }) + +// QueryMatcherAny is the SQL query matcher +// which always returns nil, used to disable +// SQL query matching. +var QueryMatcherAny QueryMatcher = QueryMatcherFunc(func(_, _ string) error { + return nil +}) diff --git a/vendor/modules.txt b/vendor/modules.txt index 36740df6..c9deafe4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -253,7 +253,7 @@ github.com/opencontainers/go-digest ## explicit; go 1.18 github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go/v1 -# github.com/pashagolub/pgxmock/v4 v4.4.0 +# github.com/pashagolub/pgxmock/v4 v4.5.0 ## explicit; go 1.22.0 github.com/pashagolub/pgxmock/v4 # github.com/pkg/errors v0.9.1