Merge pull request #2 from olomix/pgx_v5

Pgx v5

Author: olomix

.github/workflows/lint.yaml

@@ -10,10 +10,10 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
         with:
-          go-version: 1.17.7
-      - uses: golangci/golangci-lint-action@v2
+          go-version: 1.19.2
+      - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.44.2
+          version: v1.50.0

.github/workflows/test.yaml

@@ -10,7 +10,9 @@ jobs:
   test:
     strategy:
       matrix:
-        containers: [ 1.17.8-bullseye ]
+        containers:
+        - 1.18.7-bullseye
+        - 1.19.2-bullseye
     runs-on: ubuntu-latest
     container: golang:${{ matrix.containers }}
     env:
@@ -19,8 +21,8 @@ jobs:
       PGUSER: postgres
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-      - uses: actions/cache@v2
+        uses: actions/checkout@v3
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cache/go-build

README.md

@@ -2,6 +2,9 @@
 
 [![GoDoc](https://godoc.org/github.com/olomix/go-test-pg?status.svg)](https://godoc.org/github.com/olomix/go-test-pg)
 
+v2 version depends on pgx/v5. If you want support for pgx/v4, use 1.x.x
+version of this package.
+
 The aim this package is to help test golang programs against PostgreSQL
 database. It creates an empty database for each test and drops it when test
 is complete.
@@ -35,7 +38,7 @@ import (
 	"context"
 	"testing"
 
-	ptg "github.com/olomix/go-test-pg"
+	ptg "github.com/olomix/go-test-pg/v2"
 )
 
 var dbpool = &ptg.Pgpool{SchemaFile: "../schema.sql"}

database.go

@@ -14,10 +14,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jackc/pgtype"
-	"github.com/jackc/pgx/v4"
-	"github.com/jackc/pgx/v4/pgxpool"
-	"github.com/jackc/pgx/v4/stdlib"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgxpool"
+	"github.com/jackc/pgx/v5/stdlib"
+	"github.com/jackc/pgx/v5/tracelog"
 	"github.com/pkg/errors"
 )
 
@@ -148,7 +148,10 @@ func (p *Pgpool) registerStdConfig(t testing.TB,
 	if err != nil {
 		return "", errors.WithStack(err)
 	}
-	connConfig.Logger = newLogger(t)
+	connConfig.Tracer = &tracelog.TraceLog{
+		Logger:   newLogger(t),
+		LogLevel: tracelog.LogLevelTrace,
+	}
 	connConfig.Database = dbName
 	return stdlib.RegisterConnConfig(connConfig), nil
 }
@@ -180,7 +183,7 @@ func (p *Pgpool) createRndDBPool(
 	ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
 	defer cancel()
 
-	pool, err = pgxpool.ConnectConfig(ctx, cfg)
+	pool, err = pgxpool.NewWithConfig(ctx, cfg)
 	if err != nil {
 		_ = dropDB(dbName)
 		t.Fatal()
@@ -372,7 +375,7 @@ func (p *Pgpool) createTemplateDB() (string, error) {
 			// If we need to create a database, take an advisory lock on
 			// master database to prevent parallel creation of databases
 			// from several test processes.
-			var x pgtype.Unknown
+			var x interface{}
 			err = conn.
 				QueryRow(ctx, `SELECT pg_advisory_lock($1)`, lockID).
 				Scan(&x)

go.mod

@@ -1,9 +1,16 @@
-module github.com/olomix/go-test-pg
+module github.com/olomix/go-test-pg/v2
 
-go 1.14
+go 1.18
 
 require (
-	github.com/jackc/pgtype v1.10.0
-	github.com/jackc/pgx/v4 v4.15.0
+	github.com/jackc/pgx/v5 v5.0.2
 	github.com/pkg/errors v0.8.1
 )
+
+require (
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
+	github.com/jackc/puddle/v2 v2.0.0 // indirect
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
+	golang.org/x/text v0.3.7 // indirect
+)