From 7ddb024fdd4b9903927f0c55f31c4212fa3b6b14 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Wed, 18 Oct 2023 10:08:47 -0700
Subject: [PATCH 01/11] test: Add case for #2132

---
 .../endtoend/testdata/cte_join_self/issue.md  |  1 +
 .../cte_join_self/postgresql/pgx/exec.json    |  3 ++
 .../cte_join_self/postgresql/pgx/go/db.go     | 32 +++++++++++++++++
 .../cte_join_self/postgresql/pgx/go/models.go |  7 ++++
 .../postgresql/pgx/go/query.sql.go            | 34 +++++++++++++++++++
 .../cte_join_self/postgresql/pgx/query.sql    | 10 ++++++
 .../cte_join_self/postgresql/pgx/schema.sql   |  1 +
 .../cte_join_self/postgresql/pgx/sqlc.yaml    | 10 ++++++
 8 files changed, 98 insertions(+)
 create mode 100644 internal/endtoend/testdata/cte_join_self/issue.md
 create mode 100644 internal/endtoend/testdata/cte_join_self/postgresql/pgx/exec.json
 create mode 100644 internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/db.go
 create mode 100644 internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/models.go
 create mode 100644 internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/cte_join_self/postgresql/pgx/query.sql
 create mode 100644 internal/endtoend/testdata/cte_join_self/postgresql/pgx/schema.sql
 create mode 100644 internal/endtoend/testdata/cte_join_self/postgresql/pgx/sqlc.yaml

diff --git a/internal/endtoend/testdata/cte_join_self/issue.md b/internal/endtoend/testdata/cte_join_self/issue.md
new file mode 100644
index 0000000000..7dcb76baed
--- /dev/null
+++ b/internal/endtoend/testdata/cte_join_self/issue.md
@@ -0,0 +1 @@
+https://github.com/sqlc-dev/sqlc/issues/2132
diff --git a/internal/endtoend/testdata/cte_join_self/postgresql/pgx/exec.json b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/exec.json
new file mode 100644
index 0000000000..ee1b7ecd9e
--- /dev/null
+++ b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["managed-db"]
+}
diff --git a/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/db.go b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/db.go
new file mode 100644
index 0000000000..8a010ccc48
--- /dev/null
+++ b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/db.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/models.go b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/models.go
new file mode 100644
index 0000000000..172574ab22
--- /dev/null
+++ b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/models.go
@@ -0,0 +1,7 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import ()
diff --git a/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/query.sql.go
new file mode 100644
index 0000000000..e101741faa
--- /dev/null
+++ b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/query.sql.go
@@ -0,0 +1,34 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const q = `-- name: Q :one
+WITH
+    items1 AS (SELECT 'id'::TEXT AS id, 'name'::TEXT AS name),
+    items2 AS (SELECT 'id'::TEXT AS id, 'name'::TEXT AS name)
+SELECT
+    i1.id AS id1,
+    i2.id AS id2
+FROM
+    items1 i1
+        JOIN items1 i2 ON 1 = 1
+`
+
+type QRow struct {
+	Id1 string
+	Id2 string
+}
+
+func (q *Queries) Q(ctx context.Context) (QRow, error) {
+	row := q.db.QueryRow(ctx, q)
+	var i QRow
+	err := row.Scan(&i.Id1, &i.Id2)
+	return i, err
+}
diff --git a/internal/endtoend/testdata/cte_join_self/postgresql/pgx/query.sql b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/query.sql
new file mode 100644
index 0000000000..87976bc532
--- /dev/null
+++ b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/query.sql
@@ -0,0 +1,10 @@
+-- name: Q :one
+WITH
+    items1 AS (SELECT 'id'::TEXT AS id, 'name'::TEXT AS name),
+    items2 AS (SELECT 'id'::TEXT AS id, 'name'::TEXT AS name)
+SELECT
+    i1.id AS id1,
+    i2.id AS id2
+FROM
+    items1 i1
+        JOIN items1 i2 ON 1 = 1;
diff --git a/internal/endtoend/testdata/cte_join_self/postgresql/pgx/schema.sql b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/schema.sql
new file mode 100644
index 0000000000..af3b9497d9
--- /dev/null
+++ b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/schema.sql
@@ -0,0 +1 @@
+-- TODO
\ No newline at end of file
diff --git a/internal/endtoend/testdata/cte_join_self/postgresql/pgx/sqlc.yaml b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/sqlc.yaml
new file mode 100644
index 0000000000..5dc63e3f91
--- /dev/null
+++ b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/sqlc.yaml
@@ -0,0 +1,10 @@
+version: "2"
+sql:
+  - engine: "postgresql"
+    schema: "schema.sql"
+    queries: "query.sql"
+    gen:
+      go:
+        package: "querytest"
+        out: "go"
+        sql_package: "pgx/v5"

From c5291ae833bb1260b085611869db1228572c7e4a Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Wed, 18 Oct 2023 10:16:23 -0700
Subject: [PATCH 02/11] test: Add case for #2152

---
 .../testdata/batch_parameter_type/issue.md    |   1 +
 .../postgresql/pgx/exec.json                  |   3 +
 .../postgresql/pgx/go/batch.go                | 101 ++++++++++++++++++
 .../postgresql/pgx/go/db.go                   |  33 ++++++
 .../postgresql/pgx/go/models.go               |  18 ++++
 .../postgresql/pgx/go/query.sql.go            |   8 ++
 .../postgresql/pgx/query.sql                  |  32 ++++++
 .../postgresql/pgx/schema.sql                 |  14 +++
 .../postgresql/pgx/sqlc.yaml                  |  10 ++
 9 files changed, 220 insertions(+)
 create mode 100644 internal/endtoend/testdata/batch_parameter_type/issue.md
 create mode 100644 internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/exec.json
 create mode 100644 internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/batch.go
 create mode 100644 internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/db.go
 create mode 100644 internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/models.go
 create mode 100644 internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/query.sql
 create mode 100644 internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/schema.sql
 create mode 100644 internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/sqlc.yaml

diff --git a/internal/endtoend/testdata/batch_parameter_type/issue.md b/internal/endtoend/testdata/batch_parameter_type/issue.md
new file mode 100644
index 0000000000..13bb3e6b52
--- /dev/null
+++ b/internal/endtoend/testdata/batch_parameter_type/issue.md
@@ -0,0 +1 @@
+https://github.com/sqlc-dev/sqlc/issues/2152
diff --git a/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/exec.json b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/exec.json
new file mode 100644
index 0000000000..ee1b7ecd9e
--- /dev/null
+++ b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["managed-db"]
+}
diff --git a/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/batch.go b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/batch.go
new file mode 100644
index 0000000000..b64adcf2e1
--- /dev/null
+++ b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/batch.go
@@ -0,0 +1,101 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+// source: batch.go
+
+package querytest
+
+import (
+	"context"
+	"errors"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+var (
+	ErrBatchAlreadyClosed = errors.New("batch already closed")
+)
+
+const insertMappping = `-- name: InsertMappping :batchexec
+WITH
+    table1
+        AS (
+            SELECT
+                version
+            FROM
+                solar_commcard_mapping
+            WHERE
+                "deviceId" = $1
+            ORDER BY
+                "updatedAt" DESC
+            LIMIT
+                1
+        )
+INSERT
+INTO
+    solar_commcard_mapping
+        ("deviceId", version, sn, "updatedAt")
+SELECT
+    $1, $2::text, $3, $4
+WHERE
+    NOT
+        EXISTS(
+            SELECT
+                version
+            FROM
+                table1
+            WHERE
+                table1.version = $2::text
+        )
+    OR NOT EXISTS(SELECT version FROM table1)
+`
+
+type InsertMapppingBatchResults struct {
+	br     pgx.BatchResults
+	tot    int
+	closed bool
+}
+
+type InsertMapppingParams struct {
+	DeviceId  int64
+	Version   string
+	Sn        string
+	UpdatedAt pgtype.Timestamptz
+}
+
+func (q *Queries) InsertMappping(ctx context.Context, arg []InsertMapppingParams) *InsertMapppingBatchResults {
+	batch := &pgx.Batch{}
+	for _, a := range arg {
+		vals := []interface{}{
+			a.DeviceId,
+			a.Version,
+			a.Sn,
+			a.UpdatedAt,
+		}
+		batch.Queue(insertMappping, vals...)
+	}
+	br := q.db.SendBatch(ctx, batch)
+	return &InsertMapppingBatchResults{br, len(arg), false}
+}
+
+func (b *InsertMapppingBatchResults) Exec(f func(int, error)) {
+	defer b.br.Close()
+	for t := 0; t < b.tot; t++ {
+		if b.closed {
+			if f != nil {
+				f(t, ErrBatchAlreadyClosed)
+			}
+			continue
+		}
+		_, err := b.br.Exec()
+		if f != nil {
+			f(t, err)
+		}
+	}
+}
+
+func (b *InsertMapppingBatchResults) Close() error {
+	b.closed = true
+	return b.br.Close()
+}
diff --git a/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/db.go b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/db.go
new file mode 100644
index 0000000000..21d826834a
--- /dev/null
+++ b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/db.go
@@ -0,0 +1,33 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+	SendBatch(context.Context, *pgx.Batch) pgx.BatchResults
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/models.go b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/models.go
new file mode 100644
index 0000000000..c5e9f7cb57
--- /dev/null
+++ b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/models.go
@@ -0,0 +1,18 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+type SolarCommcardMapping struct {
+	ID        int64
+	DeviceId  int64
+	Version   string
+	Sn        string
+	CreatedAt pgtype.Timestamptz
+	UpdatedAt pgtype.Timestamptz
+}
diff --git a/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/query.sql.go
new file mode 100644
index 0000000000..ddc6c6534c
--- /dev/null
+++ b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/go/query.sql.go
@@ -0,0 +1,8 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+// source: query.sql
+
+package querytest
+
+import ()
diff --git a/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/query.sql b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/query.sql
new file mode 100644
index 0000000000..326b9f2f46
--- /dev/null
+++ b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/query.sql
@@ -0,0 +1,32 @@
+-- name: InsertMappping :batchexec
+WITH
+    table1
+        AS (
+            SELECT
+                version
+            FROM
+                solar_commcard_mapping
+            WHERE
+                "deviceId" = $1
+            ORDER BY
+                "updatedAt" DESC
+            LIMIT
+                1
+        )
+INSERT
+INTO
+    solar_commcard_mapping
+        ("deviceId", version, sn, "updatedAt")
+SELECT
+    $1, @version::text, $3, $4
+WHERE
+    NOT
+        EXISTS(
+            SELECT
+                *
+            FROM
+                table1
+            WHERE
+                table1.version = @version::text
+        )
+    OR NOT EXISTS(SELECT * FROM table1);
diff --git a/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/schema.sql b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/schema.sql
new file mode 100644
index 0000000000..3aaa4db952
--- /dev/null
+++ b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/schema.sql
@@ -0,0 +1,14 @@
+CREATE TABLE public.solar_commcard_mapping (
+    id
+        INT8 NOT NULL,
+    "deviceId"
+        INT8 NOT NULL,
+    version
+        VARCHAR(32) DEFAULT ''::VARCHAR NOT NULL,
+    sn
+        VARCHAR(32) DEFAULT ''::VARCHAR NOT NULL,
+    "createdAt"
+        TIMESTAMPTZ DEFAULT now(),
+    "updatedAt"
+        TIMESTAMPTZ DEFAULT now()
+);
diff --git a/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/sqlc.yaml b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/sqlc.yaml
new file mode 100644
index 0000000000..5dc63e3f91
--- /dev/null
+++ b/internal/endtoend/testdata/batch_parameter_type/postgresql/pgx/sqlc.yaml
@@ -0,0 +1,10 @@
+version: "2"
+sql:
+  - engine: "postgresql"
+    schema: "schema.sql"
+    queries: "query.sql"
+    gen:
+      go:
+        package: "querytest"
+        out: "go"
+        sql_package: "pgx/v5"

From fb2d81b0abe21b7e276ffbe5cdb1bd54908473b6 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Wed, 18 Oct 2023 10:18:12 -0700
Subject: [PATCH 03/11] test: Mark case for #2152

---
 internal/endtoend/testdata/cte_with_in/issue.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 internal/endtoend/testdata/cte_with_in/issue.md

diff --git a/internal/endtoend/testdata/cte_with_in/issue.md b/internal/endtoend/testdata/cte_with_in/issue.md
new file mode 100644
index 0000000000..34fccd51ff
--- /dev/null
+++ b/internal/endtoend/testdata/cte_with_in/issue.md
@@ -0,0 +1 @@
+https://github.com/sqlc-dev/sqlc/issues/2153

From cbc15c46efc56f5ed7cb8e8f97fbcd2f0f1f8ff5 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Wed, 18 Oct 2023 10:28:12 -0700
Subject: [PATCH 04/11] test: Add case for #2187

---
 .../testdata/cte_recursive_union/issue.md     |  1 +
 .../postgresql/pgx/exec.json                  |  3 +
 .../postgresql/pgx/go/db.go                   | 32 +++++++++++
 .../postgresql/pgx/go/models.go               | 32 +++++++++++
 .../postgresql/pgx/go/query.sql.go            | 57 +++++++++++++++++++
 .../postgresql/pgx/query.sql                  | 18 ++++++
 .../postgresql/pgx/schema.sql                 | 27 +++++++++
 .../postgresql/pgx/sqlc.yaml                  | 10 ++++
 8 files changed, 180 insertions(+)
 create mode 100644 internal/endtoend/testdata/cte_recursive_union/issue.md
 create mode 100644 internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/exec.json
 create mode 100644 internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/db.go
 create mode 100644 internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/models.go
 create mode 100644 internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/query.sql
 create mode 100644 internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/schema.sql
 create mode 100644 internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/sqlc.yaml

diff --git a/internal/endtoend/testdata/cte_recursive_union/issue.md b/internal/endtoend/testdata/cte_recursive_union/issue.md
new file mode 100644
index 0000000000..f87f5c14cb
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_union/issue.md
@@ -0,0 +1 @@
+# TODO
\ No newline at end of file
diff --git a/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/exec.json b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/exec.json
new file mode 100644
index 0000000000..ee1b7ecd9e
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["managed-db"]
+}
diff --git a/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/db.go b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/db.go
new file mode 100644
index 0000000000..8a010ccc48
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/db.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/models.go b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/models.go
new file mode 100644
index 0000000000..9d6281a37e
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/models.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+type CaseIntent struct {
+	ID               int32
+	CaseIntentString string
+	Description      string
+	Author           string
+}
+
+type CaseIntentParentJoin struct {
+	CaseIntentID       int64
+	CaseIntentParentID int64
+}
+
+type CaseIntentVersion struct {
+	VersionID int32
+	Reviewer  string
+	CreatedAt pgtype.Timestamptz
+}
+
+type CaseIntentVersionJoin struct {
+	CaseIntentID        int64
+	CaseIntentVersionID int32
+}
diff --git a/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/query.sql.go
new file mode 100644
index 0000000000..261ffb353b
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/go/query.sql.go
@@ -0,0 +1,57 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+const listCaseIntentHistory = `-- name: ListCaseIntentHistory :many
+WITH RECURSIVE descendants AS
+   ( SELECT case_intent_parent_id AS parent, case_intent_id AS child, 1 AS lvl
+     FROM case_intent_parent_join
+     UNION ALL
+     SELECT d.parent as parent, p.case_intent_id as child, d.lvl + 1 as lvl
+     FROM descendants d
+              JOIN case_intent_parent_join p
+                   ON d.child = p.case_intent_parent_id
+   )
+select distinct child, 'child' group_
+from descendants
+where parent = $1
+union
+select distinct parent, 'parent' group_
+from descendants
+where child = $1
+ORDER BY child
+`
+
+type ListCaseIntentHistoryRow struct {
+	Child int64
+	Group string
+}
+
+func (q *Queries) ListCaseIntentHistory(ctx context.Context, caseIntentID pgtype.Int8) ([]ListCaseIntentHistoryRow, error) {
+	rows, err := q.db.Query(ctx, listCaseIntentHistory, caseIntentID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []ListCaseIntentHistoryRow
+	for rows.Next() {
+		var i ListCaseIntentHistoryRow
+		if err := rows.Scan(&i.Child, &i.Group); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/query.sql b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/query.sql
new file mode 100644
index 0000000000..dce099df39
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/query.sql
@@ -0,0 +1,18 @@
+-- name: ListCaseIntentHistory :many
+WITH RECURSIVE descendants AS
+   ( SELECT case_intent_parent_id AS parent, case_intent_id AS child, 1 AS lvl
+     FROM case_intent_parent_join
+     UNION ALL
+     SELECT d.parent as parent, p.case_intent_id as child, d.lvl + 1 as lvl
+     FROM descendants d
+              JOIN case_intent_parent_join p
+                   ON d.child = p.case_intent_parent_id
+   )
+select distinct child, 'child' group_
+from descendants
+where parent = @case_intent_id
+union
+select distinct parent, 'parent' group_
+from descendants
+where child = @case_intent_id
+ORDER BY child;
diff --git a/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/schema.sql b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/schema.sql
new file mode 100644
index 0000000000..a2c3a682e0
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/schema.sql
@@ -0,0 +1,27 @@
+CREATE TABLE case_intent_version
+(
+    version_id SERIAL NOT NULL PRIMARY KEY,
+    reviewer TEXT NOT NULL,
+    created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
+);
+CREATE TABLE case_intent
+(
+    id SERIAL NOT NULL PRIMARY KEY,
+    case_intent_string TEXT NOT NULL,
+    description TEXT NOT NULL,
+    author TEXT NOT NULL
+);
+CREATE TABLE case_intent_parent_join
+(
+    case_intent_id BIGINT NOT NULL,
+    case_intent_parent_id BIGINT NOT NULL,
+    constraint fk_case_intent_id foreign key (case_intent_id) references case_intent(id),
+    constraint fk_case_intent_parent_id foreign key (case_intent_parent_id) references case_intent(id)
+);
+CREATE TABLE case_intent_version_join
+(
+    case_intent_id BIGINT NOT NULL,
+    case_intent_version_id INT NOT NULL,
+    constraint fk_case_intent_id foreign key (case_intent_id) references case_intent(id),
+    constraint fk_case_intent_version_id foreign key (case_intent_version_id) references case_intent_version(version_id)
+);
diff --git a/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/sqlc.yaml b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/sqlc.yaml
new file mode 100644
index 0000000000..5dc63e3f91
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_union/postgresql/pgx/sqlc.yaml
@@ -0,0 +1,10 @@
+version: "2"
+sql:
+  - engine: "postgresql"
+    schema: "schema.sql"
+    queries: "query.sql"
+    gen:
+      go:
+        package: "querytest"
+        out: "go"
+        sql_package: "pgx/v5"

From 80bcdc6bdfa549beb3200d878cda1540561de6c9 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Wed, 18 Oct 2023 10:42:16 -0700
Subject: [PATCH 05/11] test: Add case for #2226

---
 .../testdata/cte_nested_with/issue.md         |  1 +
 .../cte_nested_with/postgresql/pgx/exec.json  |  3 ++
 .../cte_nested_with/postgresql/pgx/go/db.go   | 32 ++++++++++++++++
 .../postgresql/pgx/go/models.go               | 15 ++++++++
 .../postgresql/pgx/go/query.sql.go            | 38 +++++++++++++++++++
 .../cte_nested_with/postgresql/pgx/query.sql  | 17 +++++++++
 .../cte_nested_with/postgresql/pgx/schema.sql |  5 +++
 .../cte_nested_with/postgresql/pgx/sqlc.yaml  | 10 +++++
 8 files changed, 121 insertions(+)
 create mode 100644 internal/endtoend/testdata/cte_nested_with/issue.md
 create mode 100644 internal/endtoend/testdata/cte_nested_with/postgresql/pgx/exec.json
 create mode 100644 internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/db.go
 create mode 100644 internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/models.go
 create mode 100644 internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/cte_nested_with/postgresql/pgx/query.sql
 create mode 100644 internal/endtoend/testdata/cte_nested_with/postgresql/pgx/schema.sql
 create mode 100644 internal/endtoend/testdata/cte_nested_with/postgresql/pgx/sqlc.yaml

diff --git a/internal/endtoend/testdata/cte_nested_with/issue.md b/internal/endtoend/testdata/cte_nested_with/issue.md
new file mode 100644
index 0000000000..40300c9c0a
--- /dev/null
+++ b/internal/endtoend/testdata/cte_nested_with/issue.md
@@ -0,0 +1 @@
+https://github.com/sqlc-dev/sqlc/issues/2226
diff --git a/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/exec.json b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/exec.json
new file mode 100644
index 0000000000..ee1b7ecd9e
--- /dev/null
+++ b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["managed-db"]
+}
diff --git a/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/db.go b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/db.go
new file mode 100644
index 0000000000..8a010ccc48
--- /dev/null
+++ b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/db.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/models.go b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/models.go
new file mode 100644
index 0000000000..b320134bd5
--- /dev/null
+++ b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/models.go
@@ -0,0 +1,15 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+type Author struct {
+	ID   int64
+	Name string
+	Bio  pgtype.Text
+}
diff --git a/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/query.sql.go
new file mode 100644
index 0000000000..2110e8bd01
--- /dev/null
+++ b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/go/query.sql.go
@@ -0,0 +1,38 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+const getAuthor = `-- name: GetAuthor :one
+WITH person AS(
+    WITH summary AS(
+        WITH mb AS(
+            select
+                id, name, bio
+            from authors
+        )
+        SELECT
+            bio
+        FROM mb
+        )
+    SELECT
+       count(*) as total
+    FROM summary
+)
+select total from person
+`
+
+func (q *Queries) GetAuthor(ctx context.Context) (pgtype.Int8, error) {
+	row := q.db.QueryRow(ctx, getAuthor)
+	var total pgtype.Int8
+	err := row.Scan(&total)
+	return total, err
+}
diff --git a/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/query.sql b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/query.sql
new file mode 100644
index 0000000000..947cdc2496
--- /dev/null
+++ b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/query.sql
@@ -0,0 +1,17 @@
+-- name: GetAuthor :one
+WITH person AS(
+    WITH summary AS(
+        WITH mb AS(
+            select
+                id, name, bio
+            from authors
+        )
+        SELECT
+            bio
+        FROM mb
+        )
+    SELECT
+       count(*) as total
+    FROM summary
+)
+select total from person;
diff --git a/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/schema.sql b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/schema.sql
new file mode 100644
index 0000000000..69b607d902
--- /dev/null
+++ b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/schema.sql
@@ -0,0 +1,5 @@
+CREATE TABLE authors (
+  id   BIGSERIAL PRIMARY KEY,
+  name text      NOT NULL,
+  bio  text
+);
diff --git a/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/sqlc.yaml b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/sqlc.yaml
new file mode 100644
index 0000000000..5dc63e3f91
--- /dev/null
+++ b/internal/endtoend/testdata/cte_nested_with/postgresql/pgx/sqlc.yaml
@@ -0,0 +1,10 @@
+version: "2"
+sql:
+  - engine: "postgresql"
+    schema: "schema.sql"
+    queries: "query.sql"
+    gen:
+      go:
+        package: "querytest"
+        out: "go"
+        sql_package: "pgx/v5"

From d50c4248986449d82941c2b9a34bbebec8c2ea25 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Wed, 18 Oct 2023 10:48:58 -0700
Subject: [PATCH 06/11] Fix build

---
 .../cte_join_self/postgresql/pgx/go/query.sql.go       | 10 +++++-----
 .../testdata/cte_join_self/postgresql/pgx/query.sql    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/query.sql.go
index e101741faa..11f83c941f 100644
--- a/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/query.sql.go
+++ b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/go/query.sql.go
@@ -9,7 +9,7 @@ import (
 	"context"
 )
 
-const q = `-- name: Q :one
+const listItems = `-- name: ListItems :one
 WITH
     items1 AS (SELECT 'id'::TEXT AS id, 'name'::TEXT AS name),
     items2 AS (SELECT 'id'::TEXT AS id, 'name'::TEXT AS name)
@@ -21,14 +21,14 @@ FROM
         JOIN items1 i2 ON 1 = 1
 `
 
-type QRow struct {
+type ListItemsRow struct {
 	Id1 string
 	Id2 string
 }
 
-func (q *Queries) Q(ctx context.Context) (QRow, error) {
-	row := q.db.QueryRow(ctx, q)
-	var i QRow
+func (q *Queries) ListItems(ctx context.Context) (ListItemsRow, error) {
+	row := q.db.QueryRow(ctx, listItems)
+	var i ListItemsRow
 	err := row.Scan(&i.Id1, &i.Id2)
 	return i, err
 }
diff --git a/internal/endtoend/testdata/cte_join_self/postgresql/pgx/query.sql b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/query.sql
index 87976bc532..972d8bf0d3 100644
--- a/internal/endtoend/testdata/cte_join_self/postgresql/pgx/query.sql
+++ b/internal/endtoend/testdata/cte_join_self/postgresql/pgx/query.sql
@@ -1,4 +1,4 @@
--- name: Q :one
+-- name: ListItems :one
 WITH
     items1 AS (SELECT 'id'::TEXT AS id, 'name'::TEXT AS name),
     items2 AS (SELECT 'id'::TEXT AS id, 'name'::TEXT AS name)

From fc10954c4b2c556ed1a0d9e47f5082cc0fb3b451 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Wed, 18 Oct 2023 11:12:33 -0700
Subject: [PATCH 07/11] test: Add case for #2364

---
 .../testdata/func_star_expansion/issue.md     |  1 +
 .../postgresql/pgx/exec.json                  |  3 ++
 .../postgresql/pgx/go/db.go                   | 32 +++++++++++++
 .../postgresql/pgx/go/models.go               |  7 +++
 .../postgresql/pgx/go/query.sql.go            | 45 +++++++++++++++++++
 .../postgresql/pgx/query.sql                  |  8 ++++
 .../postgresql/pgx/schema.sql                 | 20 +++++++++
 .../postgresql/pgx/sqlc.yaml                  | 10 +++++
 8 files changed, 126 insertions(+)
 create mode 100644 internal/endtoend/testdata/func_star_expansion/issue.md
 create mode 100644 internal/endtoend/testdata/func_star_expansion/postgresql/pgx/exec.json
 create mode 100644 internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/db.go
 create mode 100644 internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/models.go
 create mode 100644 internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/func_star_expansion/postgresql/pgx/query.sql
 create mode 100644 internal/endtoend/testdata/func_star_expansion/postgresql/pgx/schema.sql
 create mode 100644 internal/endtoend/testdata/func_star_expansion/postgresql/pgx/sqlc.yaml

diff --git a/internal/endtoend/testdata/func_star_expansion/issue.md b/internal/endtoend/testdata/func_star_expansion/issue.md
new file mode 100644
index 0000000000..c9b8798441
--- /dev/null
+++ b/internal/endtoend/testdata/func_star_expansion/issue.md
@@ -0,0 +1 @@
+https://github.com/sqlc-dev/sqlc/issues/2364
diff --git a/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/exec.json b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/exec.json
new file mode 100644
index 0000000000..ee1b7ecd9e
--- /dev/null
+++ b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["managed-db"]
+}
diff --git a/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/db.go b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/db.go
new file mode 100644
index 0000000000..8a010ccc48
--- /dev/null
+++ b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/db.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/models.go b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/models.go
new file mode 100644
index 0000000000..172574ab22
--- /dev/null
+++ b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/models.go
@@ -0,0 +1,7 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import ()
diff --git a/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/query.sql.go
new file mode 100644
index 0000000000..7272b73960
--- /dev/null
+++ b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/go/query.sql.go
@@ -0,0 +1,45 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+const testFuncGetTime = `-- name: TestFuncGetTime :one
+select test_func_get_time from test_func_get_time()
+`
+
+func (q *Queries) TestFuncGetTime(ctx context.Context) (pgtype.Timestamp, error) {
+	row := q.db.QueryRow(ctx, testFuncGetTime)
+	var test_func_get_time pgtype.Timestamp
+	err := row.Scan(&test_func_get_time)
+	return test_func_get_time, err
+}
+
+const testFuncSelectBlog = `-- name: TestFuncSelectBlog :one
+select test_func_select_blog from test_func_select_blog($1)
+`
+
+func (q *Queries) TestFuncSelectBlog(ctx context.Context, pID int32) (interface{}, error) {
+	row := q.db.QueryRow(ctx, testFuncSelectBlog, pID)
+	var test_func_select_blog interface{}
+	err := row.Scan(&test_func_select_blog)
+	return test_func_select_blog, err
+}
+
+const testFuncSelectString = `-- name: TestFuncSelectString :one
+select test_func_select_string from test_func_select_string($1)
+`
+
+func (q *Queries) TestFuncSelectString(ctx context.Context, pString string) (pgtype.Text, error) {
+	row := q.db.QueryRow(ctx, testFuncSelectString, pString)
+	var test_func_select_string pgtype.Text
+	err := row.Scan(&test_func_select_string)
+	return test_func_select_string, err
+}
diff --git a/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/query.sql b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/query.sql
new file mode 100644
index 0000000000..edb27a30f5
--- /dev/null
+++ b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/query.sql
@@ -0,0 +1,8 @@
+-- name: TestFuncGetTime :one
+select * from test_func_get_time();
+
+-- name: TestFuncSelectString :one
+select * from test_func_select_string($1);
+
+-- name: TestFuncSelectBlog :one
+select * from test_func_select_blog($1);
diff --git a/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/schema.sql b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/schema.sql
new file mode 100644
index 0000000000..eb3de78724
--- /dev/null
+++ b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/schema.sql
@@ -0,0 +1,20 @@
+create function test_func_get_time ()
+    returns timestamp AS $$
+Begin
+    return now();
+End;
+$$ language plpgsql;
+
+create function test_func_select_string (in p_string text)
+    returns text AS $$
+Begin
+    return p_string;
+End;
+$$ language plpgsql;
+
+create function test_func_select_blog(in p_id int)
+    returns table (id int, name text, created_at timestamp, updated_at timestamp) AS $$
+BEGIN RETURN QUERY
+    select id, name, created_at, updated_at from blog where id = p_id;
+END;
+$$ language plpgsql;
diff --git a/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/sqlc.yaml b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/sqlc.yaml
new file mode 100644
index 0000000000..5dc63e3f91
--- /dev/null
+++ b/internal/endtoend/testdata/func_star_expansion/postgresql/pgx/sqlc.yaml
@@ -0,0 +1,10 @@
+version: "2"
+sql:
+  - engine: "postgresql"
+    schema: "schema.sql"
+    queries: "query.sql"
+    gen:
+      go:
+        package: "querytest"
+        out: "go"
+        sql_package: "pgx/v5"

From ee19373c1e41e93710c7d4fe15c78f346b1f8f36 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Wed, 18 Oct 2023 11:21:25 -0700
Subject: [PATCH 08/11] test: Add case for #2386

---
 .../func_return_table_columns/issue.md        |  1 +
 .../postgresql/pgx/exec.json                  |  3 ++
 .../postgresql/pgx/go/db.go                   | 32 +++++++++++++++
 .../postgresql/pgx/go/models.go               | 12 ++++++
 .../postgresql/pgx/go/query.sql.go            | 41 +++++++++++++++++++
 .../postgresql/pgx/query.sql                  |  2 +
 .../postgresql/pgx/schema.sql                 | 11 +++++
 .../postgresql/pgx/sqlc.yaml                  | 10 +++++
 8 files changed, 112 insertions(+)
 create mode 100644 internal/endtoend/testdata/func_return_table_columns/issue.md
 create mode 100644 internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/exec.json
 create mode 100644 internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/db.go
 create mode 100644 internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/models.go
 create mode 100644 internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/query.sql
 create mode 100644 internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/schema.sql
 create mode 100644 internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/sqlc.yaml

diff --git a/internal/endtoend/testdata/func_return_table_columns/issue.md b/internal/endtoend/testdata/func_return_table_columns/issue.md
new file mode 100644
index 0000000000..ec4e1128f7
--- /dev/null
+++ b/internal/endtoend/testdata/func_return_table_columns/issue.md
@@ -0,0 +1 @@
+https://github.com/sqlc-dev/sqlc/issues/2386
diff --git a/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/exec.json b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/exec.json
new file mode 100644
index 0000000000..ee1b7ecd9e
--- /dev/null
+++ b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["managed-db"]
+}
diff --git a/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/db.go b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/db.go
new file mode 100644
index 0000000000..8a010ccc48
--- /dev/null
+++ b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/db.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/models.go b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/models.go
new file mode 100644
index 0000000000..da3872d18b
--- /dev/null
+++ b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/models.go
@@ -0,0 +1,12 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import ()
+
+type Blog struct {
+	ID   int32
+	Name string
+}
diff --git a/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/query.sql.go
new file mode 100644
index 0000000000..8d061c1226
--- /dev/null
+++ b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/go/query.sql.go
@@ -0,0 +1,41 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+const testFuncSelectBlog = `-- name: TestFuncSelectBlog :many
+select id, name from test_select_blog($1)
+`
+
+type TestFuncSelectBlogRow struct {
+	ID   pgtype.Int4
+	Name pgtype.Text
+}
+
+func (q *Queries) TestFuncSelectBlog(ctx context.Context, pID int32) ([]TestFuncSelectBlogRow, error) {
+	rows, err := q.db.Query(ctx, testFuncSelectBlog, pID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []TestFuncSelectBlogRow
+	for rows.Next() {
+		var i TestFuncSelectBlogRow
+		if err := rows.Scan(&i.ID, &i.Name); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/query.sql b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/query.sql
new file mode 100644
index 0000000000..73e2396558
--- /dev/null
+++ b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/query.sql
@@ -0,0 +1,2 @@
+-- name: TestFuncSelectBlog :many
+select id, name from test_select_blog($1);
diff --git a/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/schema.sql b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/schema.sql
new file mode 100644
index 0000000000..ccf032e687
--- /dev/null
+++ b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/schema.sql
@@ -0,0 +1,11 @@
+create table blog (
+    id serial primary key,
+    name text not null
+);
+
+create function test_select_blog(in p_id int)
+    returns table (id int, name text) AS $$
+BEGIN RETURN QUERY
+    select id, name from blog where id = p_id;
+END;
+$$ language plpgsql;
diff --git a/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/sqlc.yaml b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/sqlc.yaml
new file mode 100644
index 0000000000..5dc63e3f91
--- /dev/null
+++ b/internal/endtoend/testdata/func_return_table_columns/postgresql/pgx/sqlc.yaml
@@ -0,0 +1,10 @@
+version: "2"
+sql:
+  - engine: "postgresql"
+    schema: "schema.sql"
+    queries: "query.sql"
+    gen:
+      go:
+        package: "querytest"
+        out: "go"
+        sql_package: "pgx/v5"

From 936ba4665fb298e5db2bb3b85737b6e80b72a002 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Wed, 18 Oct 2023 11:28:23 -0700
Subject: [PATCH 09/11] test: Add case for #2538

---
 .../endtoend/testdata/join_order_by/issue.md  |  1 +
 .../join_order_by/postgresql/pgx/exec.json    |  3 ++
 .../join_order_by/postgresql/pgx/go/db.go     | 32 +++++++++++++++++++
 .../join_order_by/postgresql/pgx/go/models.go | 15 +++++++++
 .../postgresql/pgx/go/query.sql.go            | 23 +++++++++++++
 .../join_order_by/postgresql/pgx/query.sql    |  4 +++
 .../join_order_by/postgresql/pgx/schema.sql   |  5 +++
 .../join_order_by/postgresql/pgx/sqlc.yaml    | 10 ++++++
 8 files changed, 93 insertions(+)
 create mode 100644 internal/endtoend/testdata/join_order_by/issue.md
 create mode 100644 internal/endtoend/testdata/join_order_by/postgresql/pgx/exec.json
 create mode 100644 internal/endtoend/testdata/join_order_by/postgresql/pgx/go/db.go
 create mode 100644 internal/endtoend/testdata/join_order_by/postgresql/pgx/go/models.go
 create mode 100644 internal/endtoend/testdata/join_order_by/postgresql/pgx/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/join_order_by/postgresql/pgx/query.sql
 create mode 100644 internal/endtoend/testdata/join_order_by/postgresql/pgx/schema.sql
 create mode 100644 internal/endtoend/testdata/join_order_by/postgresql/pgx/sqlc.yaml

diff --git a/internal/endtoend/testdata/join_order_by/issue.md b/internal/endtoend/testdata/join_order_by/issue.md
new file mode 100644
index 0000000000..1c3c36feb8
--- /dev/null
+++ b/internal/endtoend/testdata/join_order_by/issue.md
@@ -0,0 +1 @@
+https://github.com/sqlc-dev/sqlc/issues/2538
diff --git a/internal/endtoend/testdata/join_order_by/postgresql/pgx/exec.json b/internal/endtoend/testdata/join_order_by/postgresql/pgx/exec.json
new file mode 100644
index 0000000000..ee1b7ecd9e
--- /dev/null
+++ b/internal/endtoend/testdata/join_order_by/postgresql/pgx/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["managed-db"]
+}
diff --git a/internal/endtoend/testdata/join_order_by/postgresql/pgx/go/db.go b/internal/endtoend/testdata/join_order_by/postgresql/pgx/go/db.go
new file mode 100644
index 0000000000..8a010ccc48
--- /dev/null
+++ b/internal/endtoend/testdata/join_order_by/postgresql/pgx/go/db.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/join_order_by/postgresql/pgx/go/models.go b/internal/endtoend/testdata/join_order_by/postgresql/pgx/go/models.go
new file mode 100644
index 0000000000..b320134bd5
--- /dev/null
+++ b/internal/endtoend/testdata/join_order_by/postgresql/pgx/go/models.go
@@ -0,0 +1,15 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+type Author struct {
+	ID   int64
+	Name string
+	Bio  pgtype.Text
+}
diff --git a/internal/endtoend/testdata/join_order_by/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/join_order_by/postgresql/pgx/go/query.sql.go
new file mode 100644
index 0000000000..560c001e67
--- /dev/null
+++ b/internal/endtoend/testdata/join_order_by/postgresql/pgx/go/query.sql.go
@@ -0,0 +1,23 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const getAuthor = `-- name: GetAuthor :one
+SELECT a.name
+FROM authors a JOIN authors b ON a.id = b.id
+ORDER BY name
+`
+
+func (q *Queries) GetAuthor(ctx context.Context) (string, error) {
+	row := q.db.QueryRow(ctx, getAuthor)
+	var name string
+	err := row.Scan(&name)
+	return name, err
+}
diff --git a/internal/endtoend/testdata/join_order_by/postgresql/pgx/query.sql b/internal/endtoend/testdata/join_order_by/postgresql/pgx/query.sql
new file mode 100644
index 0000000000..39cf01c58b
--- /dev/null
+++ b/internal/endtoend/testdata/join_order_by/postgresql/pgx/query.sql
@@ -0,0 +1,4 @@
+-- name: GetAuthor :one
+SELECT a.name
+FROM authors a JOIN authors b ON a.id = b.id
+ORDER BY name;
diff --git a/internal/endtoend/testdata/join_order_by/postgresql/pgx/schema.sql b/internal/endtoend/testdata/join_order_by/postgresql/pgx/schema.sql
new file mode 100644
index 0000000000..69b607d902
--- /dev/null
+++ b/internal/endtoend/testdata/join_order_by/postgresql/pgx/schema.sql
@@ -0,0 +1,5 @@
+CREATE TABLE authors (
+  id   BIGSERIAL PRIMARY KEY,
+  name text      NOT NULL,
+  bio  text
+);
diff --git a/internal/endtoend/testdata/join_order_by/postgresql/pgx/sqlc.yaml b/internal/endtoend/testdata/join_order_by/postgresql/pgx/sqlc.yaml
new file mode 100644
index 0000000000..5dc63e3f91
--- /dev/null
+++ b/internal/endtoend/testdata/join_order_by/postgresql/pgx/sqlc.yaml
@@ -0,0 +1,10 @@
+version: "2"
+sql:
+  - engine: "postgresql"
+    schema: "schema.sql"
+    queries: "query.sql"
+    gen:
+      go:
+        package: "querytest"
+        out: "go"
+        sql_package: "pgx/v5"

From af11d3dbb9a1695449e35bc2656d90b24292c35e Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Wed, 18 Oct 2023 11:49:49 -0700
Subject: [PATCH 10/11] test: Add case for #2644

---
 .../testdata/cte_recursive_subquery/issue.md  |  1 +
 .../postgresql/pgx/exec.json                  |  3 +
 .../postgresql/pgx/go/db.go                   | 32 ++++++++++
 .../postgresql/pgx/go/models.go               | 15 +++++
 .../postgresql/pgx/go/query.sql.go            | 60 +++++++++++++++++++
 .../postgresql/pgx/query.sql                  | 33 ++++++++++
 .../postgresql/pgx/schema.sql                 |  5 ++
 .../postgresql/pgx/sqlc.yaml                  | 14 +++++
 8 files changed, 163 insertions(+)
 create mode 100644 internal/endtoend/testdata/cte_recursive_subquery/issue.md
 create mode 100644 internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/exec.json
 create mode 100644 internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/db.go
 create mode 100644 internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/models.go
 create mode 100644 internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/query.sql
 create mode 100644 internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/schema.sql
 create mode 100644 internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/sqlc.yaml

diff --git a/internal/endtoend/testdata/cte_recursive_subquery/issue.md b/internal/endtoend/testdata/cte_recursive_subquery/issue.md
new file mode 100644
index 0000000000..98c00da500
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_subquery/issue.md
@@ -0,0 +1 @@
+https://github.com/sqlc-dev/sqlc/issues/2644
diff --git a/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/exec.json b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/exec.json
new file mode 100644
index 0000000000..ee1b7ecd9e
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["managed-db"]
+}
diff --git a/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/db.go b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/db.go
new file mode 100644
index 0000000000..8a010ccc48
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/db.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/models.go b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/models.go
new file mode 100644
index 0000000000..aee0aedce6
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/models.go
@@ -0,0 +1,15 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+type Version struct {
+	ID                int64
+	Name              pgtype.Text
+	PreviousVersionID int64
+}
diff --git a/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/query.sql.go
new file mode 100644
index 0000000000..0e74d16ed8
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/go/query.sql.go
@@ -0,0 +1,60 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const getLatestVersion = `-- name: GetLatestVersion :one
+WITH RECURSIVE search_tree(id, chain_id, chain_counter) AS (
+	SELECT base.id, base.id AS chain_id, 0 as chain_counter
+	FROM versions AS base
+	WHERE base.previous_version_id IS NULL
+  	UNION ALL
+	SELECT v.id, search_tree.chain_id, search_tree.chain_counter + 1
+	FROM versions AS v
+	INNER JOIN search_tree ON search_tree.id = v.previous_version_id
+)
+SELECT DISTINCT ON (search_tree.chain_id) 
+	search_tree.id
+FROM search_tree   
+ORDER BY search_tree.chain_id, chain_counter DESC
+`
+
+func (q *Queries) GetLatestVersion(ctx context.Context) (int64, error) {
+	row := q.db.QueryRow(ctx, getLatestVersion)
+	var id int64
+	err := row.Scan(&id)
+	return id, err
+}
+
+const getLatestVersionWithSubquery = `-- name: GetLatestVersionWithSubquery :one
+SELECT id
+FROM versions
+WHERE versions.id IN (
+  WITH RECURSIVE search_tree(id, chain_id, chain_counter) AS (
+	SELECT base.id, base.id AS chain_id, 0 as chain_counter
+	FROM versions AS base
+	WHERE versions.previous_version_id IS NULL
+	UNION ALL
+	SELECT v.id, search_tree.chain_id, search_tree.chain_counter + 1
+	FROM versions AS v
+	INNER JOIN search_tree ON search_tree.id = v.previous_version_id 
+  )
+  SELECT DISTINCT ON (search_tree.chain_id) 
+	search_tree.id
+  FROM search_tree   
+  ORDER BY search_tree.chain_id, chain_counter DESC
+)
+`
+
+func (q *Queries) GetLatestVersionWithSubquery(ctx context.Context) (int64, error) {
+	row := q.db.QueryRow(ctx, getLatestVersionWithSubquery)
+	var id int64
+	err := row.Scan(&id)
+	return id, err
+}
diff --git a/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/query.sql b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/query.sql
new file mode 100644
index 0000000000..021d493d84
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/query.sql
@@ -0,0 +1,33 @@
+-- name: GetLatestVersion :one
+WITH RECURSIVE search_tree(id, chain_id, chain_counter) AS (
+	SELECT base.id, base.id AS chain_id, 0 as chain_counter
+	FROM versions AS base
+	WHERE base.previous_version_id IS NULL
+  	UNION ALL
+	SELECT v.id, search_tree.chain_id, search_tree.chain_counter + 1
+	FROM versions AS v
+	INNER JOIN search_tree ON search_tree.id = v.previous_version_id
+)
+SELECT DISTINCT ON (search_tree.chain_id) 
+	search_tree.id
+FROM search_tree   
+ORDER BY search_tree.chain_id, chain_counter DESC;
+
+-- name: GetLatestVersionWithSubquery :one
+SELECT id
+FROM versions
+WHERE versions.id IN (
+  WITH RECURSIVE search_tree(id, chain_id, chain_counter) AS (
+	SELECT base.id, base.id AS chain_id, 0 as chain_counter
+	FROM versions AS base
+	WHERE versions.previous_version_id IS NULL
+	UNION ALL
+	SELECT v.id, search_tree.chain_id, search_tree.chain_counter + 1
+	FROM versions AS v
+	INNER JOIN search_tree ON search_tree.id = v.previous_version_id 
+  )
+  SELECT DISTINCT ON (search_tree.chain_id) 
+	search_tree.id
+  FROM search_tree   
+  ORDER BY search_tree.chain_id, chain_counter DESC
+);
diff --git a/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/schema.sql b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/schema.sql
new file mode 100644
index 0000000000..766adb01a8
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/schema.sql
@@ -0,0 +1,5 @@
+CREATE TABLE versions (
+  id   BIGSERIAL PRIMARY KEY,
+  name TEXT,
+  previous_version_id bigint NOT NULL
+);
diff --git a/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/sqlc.yaml b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/sqlc.yaml
new file mode 100644
index 0000000000..2f12715923
--- /dev/null
+++ b/internal/endtoend/testdata/cte_recursive_subquery/postgresql/pgx/sqlc.yaml
@@ -0,0 +1,14 @@
+version: "2"
+cloud:
+  project: "01HAQMMECEYQYKFJN8MP16QC41"
+sql:
+  - engine: "postgresql"
+    schema: "schema.sql"
+    queries: "query.sql"
+    gen:
+      go:
+        package: "querytest"
+        out: "go"
+        sql_package: "pgx/v5"
+    database:
+      managed: true

From 61b86e90f47953c2ca18764426e46dbb01b262d7 Mon Sep 17 00:00:00 2001
From: Kyle Conroy <kyle@sqlc.dev>
Date: Wed, 18 Oct 2023 11:52:54 -0700
Subject: [PATCH 11/11] test: Add case for #2731

---
 .../testdata/json_array_elements/issue.md     |  1 +
 .../postgresql/pgx/exec.json                  |  3 ++
 .../postgresql/pgx/go/db.go                   | 32 +++++++++++++++++++
 .../postgresql/pgx/go/models.go               | 15 +++++++++
 .../postgresql/pgx/go/query.sql.go            | 32 +++++++++++++++++++
 .../postgresql/pgx/query.sql                  |  6 ++++
 .../postgresql/pgx/schema.sql                 |  8 +++++
 .../postgresql/pgx/sqlc.yaml                  | 10 ++++++
 8 files changed, 107 insertions(+)
 create mode 100644 internal/endtoend/testdata/json_array_elements/issue.md
 create mode 100644 internal/endtoend/testdata/json_array_elements/postgresql/pgx/exec.json
 create mode 100644 internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/db.go
 create mode 100644 internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/models.go
 create mode 100644 internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/query.sql.go
 create mode 100644 internal/endtoend/testdata/json_array_elements/postgresql/pgx/query.sql
 create mode 100644 internal/endtoend/testdata/json_array_elements/postgresql/pgx/schema.sql
 create mode 100644 internal/endtoend/testdata/json_array_elements/postgresql/pgx/sqlc.yaml

diff --git a/internal/endtoend/testdata/json_array_elements/issue.md b/internal/endtoend/testdata/json_array_elements/issue.md
new file mode 100644
index 0000000000..d33962b191
--- /dev/null
+++ b/internal/endtoend/testdata/json_array_elements/issue.md
@@ -0,0 +1 @@
+https://github.com/sqlc-dev/sqlc/issues/2731
diff --git a/internal/endtoend/testdata/json_array_elements/postgresql/pgx/exec.json b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/exec.json
new file mode 100644
index 0000000000..ee1b7ecd9e
--- /dev/null
+++ b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/exec.json
@@ -0,0 +1,3 @@
+{
+  "contexts": ["managed-db"]
+}
diff --git a/internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/db.go b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/db.go
new file mode 100644
index 0000000000..8a010ccc48
--- /dev/null
+++ b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/db.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgconn"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/models.go b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/models.go
new file mode 100644
index 0000000000..6be20541af
--- /dev/null
+++ b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/models.go
@@ -0,0 +1,15 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+
+package querytest
+
+import ()
+
+type SysAction struct {
+	ID        int64
+	Code      string
+	Menu      string
+	Title     string
+	Resources []byte
+}
diff --git a/internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/query.sql.go b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/query.sql.go
new file mode 100644
index 0000000000..376f1884a1
--- /dev/null
+++ b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/go/query.sql.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.22.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgx/v5/pgtype"
+)
+
+const getActionCodeByResource = `-- name: GetActionCodeByResource :one
+SELECT code, arr.item_object ->> 'code'  as resource_code
+FROM sys_actions,
+    jsonb_array_elements(resources) with ordinality arr(item_object, resource)
+    WHERE item_object->>'resource' = $1
+    LIMIT 1
+`
+
+type GetActionCodeByResourceRow struct {
+	Code         string
+	ResourceCode pgtype.Text
+}
+
+func (q *Queries) GetActionCodeByResource(ctx context.Context, resource pgtype.Text) (GetActionCodeByResourceRow, error) {
+	row := q.db.QueryRow(ctx, getActionCodeByResource, resource)
+	var i GetActionCodeByResourceRow
+	err := row.Scan(&i.Code, &i.ResourceCode)
+	return i, err
+}
diff --git a/internal/endtoend/testdata/json_array_elements/postgresql/pgx/query.sql b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/query.sql
new file mode 100644
index 0000000000..44fe758df0
--- /dev/null
+++ b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/query.sql
@@ -0,0 +1,6 @@
+-- name: GetActionCodeByResource :one
+SELECT code, arr.item_object ->> 'code'  as resource_code
+FROM sys_actions,
+    jsonb_array_elements(resources) with ordinality arr(item_object, resource)
+    WHERE item_object->>'resource' = sqlc.arg('resource')
+    LIMIT 1;
diff --git a/internal/endtoend/testdata/json_array_elements/postgresql/pgx/schema.sql b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/schema.sql
new file mode 100644
index 0000000000..b10a6c1d10
--- /dev/null
+++ b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/schema.sql
@@ -0,0 +1,8 @@
+CREATE TABLE "sys_actions" (
+    "id" int8 NOT NULL,
+    "code" varchar(20) NOT NULL,
+    "menu" varchar(255) NOT NULL,
+    "title" varchar(20) NOT NULL,
+    "resources" jsonb,
+    PRIMARY KEY ("id")
+);
diff --git a/internal/endtoend/testdata/json_array_elements/postgresql/pgx/sqlc.yaml b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/sqlc.yaml
new file mode 100644
index 0000000000..5dc63e3f91
--- /dev/null
+++ b/internal/endtoend/testdata/json_array_elements/postgresql/pgx/sqlc.yaml
@@ -0,0 +1,10 @@
+version: "2"
+sql:
+  - engine: "postgresql"
+    schema: "schema.sql"
+    queries: "query.sql"
+    gen:
+      go:
+        package: "querytest"
+        out: "go"
+        sql_package: "pgx/v5"