Merge pull request #100 from pashagolub/97-update-pgx-to-v5

[!] add support for `jackc/pgx/v5`, closes #97

README.md

@@ -37,7 +37,7 @@ package main
 import (
 	"context"
 
-	pgx "github.com/jackc/pgx/v4"
+	pgx "github.com/jackc/pgx/v5"
 )
 
 type PgxIface interface {

driver.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/jackc/pgx/v4/pgxpool"
+	"github.com/jackc/pgx/v5/pgxpool"
 )
 
 type pgxmockConn struct {

examples/basic/basic.go

@@ -3,7 +3,7 @@ package main
 import (
 	"context"
 
-	pgx "github.com/jackc/pgx/v4"
+	pgx "github.com/jackc/pgx/v5"
 )
 
 type PgxIface interface {

examples/basic/basic_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/pashagolub/pgxmock"
+	"github.com/pashagolub/pgxmock/v2"
 )
 
 // a successful case

examples/blog/blog.go

@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	pgconn "github.com/jackc/pgconn"
-	pgx "github.com/jackc/pgx/v4"
+	pgx "github.com/jackc/pgx/v5"
+	pgconn "github.com/jackc/pgx/v5/pgconn"
 )
 
 type PgxIface interface {

examples/blog/blog_test.go

@@ -9,7 +9,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/pashagolub/pgxmock"
+	"github.com/pashagolub/pgxmock/v2"
 )
 
 func (a *api) assertJSON(actual []byte, data interface{}, t *testing.T) {

expectations.go

@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jackc/pgconn"
-	pgx "github.com/jackc/pgx/v4"
+	pgx "github.com/jackc/pgx/v5"
+	pgconn "github.com/jackc/pgx/v5/pgconn"
 )
 
 // an expectation interface
@@ -233,7 +233,7 @@ func (e *ExpectedExec) String() string {
 		msg += strings.Join(margs, "\n")
 	}
 
-	if e.result != nil {
+	if e.result.String() > "" {
 		msg += "\n  - should return Result having:"
 		msg += fmt.Sprintf("\n      RowsAffected: %d", e.result.RowsAffected())
 	}
@@ -371,19 +371,7 @@ func (e *ExpectedPing) String() string {
 // WillReturnRows specifies the set of resulting rows that will be returned
 // by the triggered query
 func (e *ExpectedQuery) WillReturnRows(rows ...*Rows) *ExpectedQuery {
-	defs := 0
-	sets := make([]*Rows, len(rows))
-	for i, r := range rows {
-		sets[i] = r
-		if r.defs != nil {
-			defs++
-		}
-	}
-	if defs > 0 && defs == len(sets) {
-		e.rows = &rowSetsWithDefinition{&rowSets{sets: sets, ex: e}}
-	} else {
-		e.rows = &rowSets{sets: sets, ex: e}
-	}
+	e.rows = &rowSets{sets: rows, ex: e}
 	return e
 }
 

go.mod

@@ -1,21 +1,13 @@
-module github.com/pashagolub/pgxmock
+module github.com/pashagolub/pgxmock/v2
 
-go 1.17
+go 1.19
 
-require (
-	github.com/jackc/pgconn v1.13.0
-	github.com/jackc/pgproto3/v2 v2.3.1
-	github.com/jackc/pgtype v1.12.0
-	github.com/jackc/pgx/v4 v4.17.2
-	github.com/pashagolub/pgxstruct v0.0.0-20210217101842-40d357eec200
-)
+require github.com/jackc/pgx/v5 v5.0.0
 
 require (
-	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/puddle v1.3.0 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
+	github.com/jackc/puddle/v2 v2.0.0 // indirect
+	golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 // indirect
 	golang.org/x/text v0.3.7 // indirect
 )