Upgrade to pgx v5

- For pggen row structs, implement pgx.RowScanner. - Remove the typeResolver, since we're punting type resolution to the pgx.Conn type map for now. #74
jschaf · Jan 5, 2024 · b524213 · b524213
1 parent 3259c9a
commit b524213
Show file tree

Hide file tree

Showing 57 changed files with 346 additions and 455 deletions.
diff --git a/example/acceptance_test.go b/example/acceptance_test.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v5"
 	"github.com/jschaf/pggen/internal/errs"
 	"github.com/jschaf/pggen/internal/pgdocker"
 	"math/rand"
@@ -57,7 +57,7 @@ func TestExamples(t *testing.T) {
 				"--go-type", "int8=int",
 				"--go-type", "int4=int",
 				"--go-type", "text=string",
-				"--go-type", "citext=github.com/jackc/pgtype.Text",
+				"--go-type", "citext=github.com/jackc/pgx/v5/pgtype.Text",
 			},
 		},
 		{
@@ -179,8 +179,8 @@ func TestExamples(t *testing.T) {
 			args: []string{
 				"--schema-glob", "example/ltree/schema.sql",
 				"--query-glob", "example/ltree/query.sql",
-				"--go-type", "ltree=github.com/jackc/pgtype.Text",
-				"--go-type", "_ltree=github.com/jackc/pgtype.TextArray",
+				"--go-type", "ltree=github.com/jackc/pgx/v5/pgtype.Text",
+				"--go-type", "_ltree=github.com/jackc/pgx/v5/pgtype.TextArray",
 			},
 		},
 		{

diff --git a/example/author/query.sql.go b/example/author/query.sql.go
diff --git a/example/author/query.sql_test.go b/example/author/query.sql_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"testing"
 
-	"github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v5"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/example/complex_params/query.sql.go b/example/complex_params/query.sql.go
diff --git a/example/composite/codegen_test.go b/example/composite/codegen_test.go
@@ -28,7 +28,7 @@ func TestGenerate_Go_Example_Composite(t *testing.T) {
 				"int8":   "int",
 				"int4":   "int",
 				"text":   "string",
-				"citext": "github.com/jackc/pgtype.Text",
+				"citext": "github.com/jackc/pgx/v5/pgtype.Text",
 			},
 		})
 	if err != nil {

diff --git a/example/composite/query.sql.go b/example/composite/query.sql.go
diff --git a/example/composite/query.sql_test.go b/example/composite/query.sql_test.go
@@ -2,7 +2,7 @@ package composite
 
 import (
 	"context"
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jschaf/pggen/internal/difftest"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/jschaf/pggen/internal/ptrs"

diff --git a/example/custom_types/query.sql.go b/example/custom_types/query.sql.go
diff --git a/example/custom_types/query.sql_test.go b/example/custom_types/query.sql_test.go
@@ -2,7 +2,7 @@ package custom_types
 
 import (
 	"context"
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/jschaf/pggen/internal/texts"
 	"github.com/stretchr/testify/assert"
@@ -38,7 +38,7 @@ func TestQuerier_CustomMyInt(t *testing.T) {
 			AND pn.nspname = current_schema()
 		LIMIT 1;
 	`))
-	oidVal := pgtype.OIDValue{}
+	oidVal := uint32Value{}
 	err := row.Scan(&oidVal)
 	require.NoError(t, err)
 	t.Logf("my_int oid: %d", oidVal.Uint)

diff --git a/example/device/query.sql.go b/example/device/query.sql.go
diff --git a/example/device/query.sql_test.go b/example/device/query.sql_test.go
@@ -2,7 +2,7 @@ package device
 
 import (
 	"context"
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/example/domain/query.sql.go b/example/domain/query.sql.go
diff --git a/example/enums/query.sql.go b/example/enums/query.sql.go
diff --git a/example/enums/query.sql_test.go b/example/enums/query.sql_test.go
@@ -2,7 +2,7 @@ package enums
 
 import (
 	"context"
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/example/erp/order/customer.sql.go b/example/erp/order/customer.sql.go
diff --git a/example/erp/order/customer.sql_test.go b/example/erp/order/customer.sql_test.go
@@ -2,7 +2,7 @@ package order
 
 import (
 	"context"
-	"github.com/jackc/pgtype"
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jschaf/pggen/internal/pgtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/example/erp/order/price.sql.go b/example/erp/order/price.sql.go
diff --git a/example/function/query.sql.go b/example/function/query.sql.go