[WIP] pgx v5

.circleci/config.yml

@@ -2,11 +2,12 @@ version: 2.1
 orbs:
   codecov: codecov/[email protected]
   ucheck: udacity/ucheck@1
+  go: circleci/[email protected]
 
 executors:
   go:
     docker:
-      - image: cimg/go:1.18
+      - image: cimg/go:1.21
   vm:
     machine:
       image: ubuntu-2004:202111-02
@@ -23,6 +24,8 @@ jobs:
     executor: vm
     steps:
       - checkout
+      - go/install:
+          version: "1.21.3"
       - run:
           name: Run tests
           command: make test

.golangci.yml

@@ -1,16 +1,22 @@
 linters:
   enable-all: true
   disable:
-    - typecheck
+    - deadcode # deprecated
     - golint # deprecated
+    - ifshort # deprecated
     - interfacer # deprecated
     - maligned # deprecated
+    - nosnakecase # deprecated
     - scopelint # deprecated
+    - structcheck # deprecated
+    - varcheck # deprecated
+    - depguard
     - exhaustivestruct
     - exhaustruct
     - gochecknoglobals
     - gochecknoinits
     - paralleltest
+    - typecheck
     - cyclop # todo
     - errorlint # todo
     - funlen # todo

cmd/pgverify/cmd.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v5"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 

config.go

@@ -61,7 +61,7 @@ type Config struct {
 
 // Option interface used for setting optional config properties.
 type Option interface {
-	apply(*Config)
+	apply(c *Config)
 }
 
 type optionFunc func(*Config)

integration_test.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/cjfinnell/pgverify"
 	"github.com/google/uuid"
-	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v5"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -68,8 +68,8 @@ func createContainer(t *testing.T, ctx context.Context, image string, port int,
 			image: image,
 			ports: []*portMapping{
 				{
-					HostPort:      fmt.Sprintf("%d", hostPort),
-					ContainerPort: fmt.Sprintf("%d", port),
+					HostPort:      strconv.Itoa(hostPort),
+					ContainerPort: strconv.Itoa(port),
 				},
 			},
 			env: env,
@@ -261,9 +261,9 @@ func TestVerifyData(t *testing.T) {
 		aliases = append(aliases, db.image)
 		// Create db and connect
 		_, port, err := createContainer(t, ctx, db.image, db.port, db.env, db.cmd)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		config, err := pgx.ParseConfig(fmt.Sprintf("postgresql://%[email protected]:%d%s", db.userPassword, port, db.db))
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.True(t, waitForDBReady(t, ctx, config))
 		conn, err := pgx.ConnectConfig(ctx, config)
 		require.NoError(t, err)
@@ -274,7 +274,7 @@ func TestVerifyData(t *testing.T) {
 		for _, tableName := range tableNames {
 			createTableQuery := fmt.Sprintf(`CREATE TABLE "%s" %s`, tableName, createTableQueryBase)
 			_, err = conn.Exec(ctx, createTableQuery)
-			assert.NoError(t, err, "Failed to create table %s on %v with query: %s", tableName, db.image, createTableQuery)
+			require.NoError(t, err, "Failed to create table %s on %v with query: %s", tableName, db.image, createTableQuery)
 
 			pkeyString := fmt.Sprintf("single_col_pkey_%s PRIMARY KEY (id)", tableName)
 			if tableName == tableNames[1] {
@@ -283,12 +283,12 @@ func TestVerifyData(t *testing.T) {
 
 			alterTableQuery := fmt.Sprintf(`ALTER TABLE ONLY "%s" ADD CONSTRAINT %s;`, tableName, pkeyString)
 			_, err = conn.Exec(ctx, alterTableQuery)
-			assert.NoError(t, err, "Failed to add primary key to table %s on %v with query %s", tableName, db.image, alterTableQuery)
+			require.NoError(t, err, "Failed to add primary key to table %s on %v with query %s", tableName, db.image, alterTableQuery)
 
 			rand.Shuffle(len(valueClauses), func(i, j int) { valueClauses[i], valueClauses[j] = valueClauses[j], valueClauses[i] })
 			insertDataQuery := fmt.Sprintf(`INSERT INTO "%s" %s %s`, tableName, insertDataQueryBase, strings.Join(valueClauses, ", "))
 			_, err = conn.Exec(ctx, insertDataQuery)
-			assert.NoError(t, err, "Failed to insert data to table on %v with query %s", tableName, db.image, insertDataQuery)
+			require.NoError(t, err, "Failed to insert data to table on %v with query %s", tableName, db.image, insertDataQuery)
 		}
 
 		targets = append(targets, config)
@@ -313,7 +313,7 @@ func TestVerifyData(t *testing.T) {
 			pgverify.WithAliases(aliases),
 			pgverify.WithBookendLimit(5),
 		)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		results.WriteAsTable(os.Stdout)
 	}
 }

log.go

@@ -3,21 +3,35 @@
 import (
 	"context"
 
-	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v5/tracelog"
 	"github.com/sirupsen/logrus"
 )
 
-var _ pgx.Logger = (*pgxLogger)(nil)
+var _ tracelog.Logger = (*pgxLogger)(nil)
 
 type pgxLogger struct {
 	l logrus.FieldLogger
 }
 
-func (p *pgxLogger) Log(ctx context.Context, level pgx.LogLevel, msg string, data map[string]interface{}) {
+func (p *pgxLogger) Log(ctx context.Context, level tracelog.LogLevel, msg string, data map[string]interface{}) {
 	parsedLevel, err := logrus.ParseLevel(level.String())
 	if err != nil {
 		parsedLevel = logrus.ErrorLevel
 	}
 
 	p.l.WithFields(data).Log(parsedLevel, msg)
 }
+
+func NewTraceLogger(l *logrus.Entry) *tracelog.TraceLog {
+	logLevel, err := tracelog.LogLevelFromString(l.Level.String())
+	if err != nil {
+		l.WithError(err).Warn("failed to parse log level, defaulting to error")
+
+		logLevel = tracelog.LogLevelError
+	}
+
+	return &tracelog.TraceLog{
+		Logger:   &pgxLogger{l},
+		LogLevel: logLevel,
+	}
+}