diff --git a/internal/compiler/query_catalog.go b/internal/compiler/query_catalog.go
index e7058de4bd..8dc0a0ac2c 100644
--- a/internal/compiler/query_catalog.go
+++ b/internal/compiler/query_catalog.go
@@ -15,6 +15,8 @@ type QueryCatalog struct {
 func buildQueryCatalog(c *catalog.Catalog, node ast.Node) (*QueryCatalog, error) {
 	var with *ast.WithClause
 	switch n := node.(type) {
+	case *ast.DeleteStmt:
+		with = n.WithClause
 	case *ast.InsertStmt:
 		with = n.WithClause
 	case *ast.UpdateStmt:
diff --git a/internal/endtoend/testdata/cte_in_delete/mysql/go/db.go b/internal/endtoend/testdata/cte_in_delete/mysql/go/db.go
new file mode 100644
index 0000000000..6a99519302
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/mysql/go/db.go
@@ -0,0 +1,29 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx *sql.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/cte_in_delete/mysql/go/models.go b/internal/endtoend/testdata/cte_in_delete/mysql/go/models.go
new file mode 100644
index 0000000000..b8ffb631f9
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/mysql/go/models.go
@@ -0,0 +1,10 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+package querytest
+
+import ()
+
+type Bar struct {
+	ID    int32
+	Ready bool
+}
diff --git a/internal/endtoend/testdata/cte_in_delete/mysql/go/query.sql.go b/internal/endtoend/testdata/cte_in_delete/mysql/go/query.sql.go
new file mode 100644
index 0000000000..a8ba866cfd
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/mysql/go/query.sql.go
@@ -0,0 +1,20 @@
+// Code generated by sqlc. DO NOT EDIT.
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const deleteReadyWithCTE = `-- name: DeleteReadyWithCTE :exec
+WITH ready_ids AS (
+	SELECT id FROM bar WHERE ready
+)
+DELETE FROM bar WHERE id IN (SELECT id FROM ready_ids)
+`
+
+func (q *Queries) DeleteReadyWithCTE(ctx context.Context) error {
+	_, err := q.db.ExecContext(ctx, deleteReadyWithCTE)
+	return err
+}
diff --git a/internal/endtoend/testdata/cte_in_delete/mysql/query.sql b/internal/endtoend/testdata/cte_in_delete/mysql/query.sql
new file mode 100644
index 0000000000..4cbed16e64
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/mysql/query.sql
@@ -0,0 +1,7 @@
+CREATE TABLE bar (id integer NOT NULL AUTO_INCREMENT PRIMARY KEY, ready bool not null);
+
+-- name: DeleteReadyWithCTE :exec
+WITH ready_ids AS (
+	SELECT id FROM bar WHERE ready
+)
+DELETE FROM bar WHERE id IN (SELECT * FROM ready_ids);
diff --git a/internal/endtoend/testdata/cte_in_delete/mysql/sqlc.json b/internal/endtoend/testdata/cte_in_delete/mysql/sqlc.json
new file mode 100644
index 0000000000..0657f4db83
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/mysql/sqlc.json
@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "engine": "mysql",
+      "path": "go",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/cte_in_delete/pgx/go/db.go b/internal/endtoend/testdata/cte_in_delete/pgx/go/db.go
new file mode 100644
index 0000000000..4559f50a4f
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/pgx/go/db.go
@@ -0,0 +1,30 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgconn"
+	"github.com/jackc/pgx/v4"
+)
+
+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_in_delete/pgx/go/models.go b/internal/endtoend/testdata/cte_in_delete/pgx/go/models.go
new file mode 100644
index 0000000000..b8ffb631f9
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/pgx/go/models.go
@@ -0,0 +1,10 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+package querytest
+
+import ()
+
+type Bar struct {
+	ID    int32
+	Ready bool
+}
diff --git a/internal/endtoend/testdata/cte_in_delete/pgx/go/query.sql.go b/internal/endtoend/testdata/cte_in_delete/pgx/go/query.sql.go
new file mode 100644
index 0000000000..f825dd432c
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/pgx/go/query.sql.go
@@ -0,0 +1,36 @@
+// Code generated by sqlc. DO NOT EDIT.
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const deleteReadyWithCTE = `-- name: DeleteReadyWithCTE :many
+WITH ready_ids AS (
+	SELECT id FROM bar WHERE ready
+)
+DELETE FROM bar WHERE id IN (SELECT id FROM ready_ids)
+RETURNING id
+`
+
+func (q *Queries) DeleteReadyWithCTE(ctx context.Context) ([]int32, error) {
+	rows, err := q.db.Query(ctx, deleteReadyWithCTE)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []int32
+	for rows.Next() {
+		var id int32
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/cte_in_delete/pgx/query.sql b/internal/endtoend/testdata/cte_in_delete/pgx/query.sql
new file mode 100644
index 0000000000..2696c27bc0
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/pgx/query.sql
@@ -0,0 +1,8 @@
+CREATE TABLE bar (id serial primary key not null, ready bool not null);
+
+-- name: DeleteReadyWithCTE :many
+WITH ready_ids AS (
+	SELECT id FROM bar WHERE ready
+)
+DELETE FROM bar WHERE id IN (SELECT * FROM ready_ids)
+RETURNING id;
diff --git a/internal/endtoend/testdata/cte_in_delete/pgx/sqlc.json b/internal/endtoend/testdata/cte_in_delete/pgx/sqlc.json
new file mode 100644
index 0000000000..9403bd0279
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/pgx/sqlc.json
@@ -0,0 +1,13 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v4",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/cte_in_delete/stdlib/go/db.go b/internal/endtoend/testdata/cte_in_delete/stdlib/go/db.go
new file mode 100644
index 0000000000..6a99519302
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/stdlib/go/db.go
@@ -0,0 +1,29 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx *sql.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/cte_in_delete/stdlib/go/models.go b/internal/endtoend/testdata/cte_in_delete/stdlib/go/models.go
new file mode 100644
index 0000000000..b8ffb631f9
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/stdlib/go/models.go
@@ -0,0 +1,10 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+package querytest
+
+import ()
+
+type Bar struct {
+	ID    int32
+	Ready bool
+}
diff --git a/internal/endtoend/testdata/cte_in_delete/stdlib/go/query.sql.go b/internal/endtoend/testdata/cte_in_delete/stdlib/go/query.sql.go
new file mode 100644
index 0000000000..20cfd3aeff
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/stdlib/go/query.sql.go
@@ -0,0 +1,39 @@
+// Code generated by sqlc. DO NOT EDIT.
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const deleteReadyWithCTE = `-- name: DeleteReadyWithCTE :many
+WITH ready_ids AS (
+	SELECT id FROM bar WHERE ready
+)
+DELETE FROM bar WHERE id IN (SELECT id FROM ready_ids)
+RETURNING id
+`
+
+func (q *Queries) DeleteReadyWithCTE(ctx context.Context) ([]int32, error) {
+	rows, err := q.db.QueryContext(ctx, deleteReadyWithCTE)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []int32
+	for rows.Next() {
+		var id int32
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		items = append(items, id)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/cte_in_delete/stdlib/query.sql b/internal/endtoend/testdata/cte_in_delete/stdlib/query.sql
new file mode 100644
index 0000000000..2696c27bc0
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/stdlib/query.sql
@@ -0,0 +1,8 @@
+CREATE TABLE bar (id serial primary key not null, ready bool not null);
+
+-- name: DeleteReadyWithCTE :many
+WITH ready_ids AS (
+	SELECT id FROM bar WHERE ready
+)
+DELETE FROM bar WHERE id IN (SELECT * FROM ready_ids)
+RETURNING id;
diff --git a/internal/endtoend/testdata/cte_in_delete/stdlib/sqlc.json b/internal/endtoend/testdata/cte_in_delete/stdlib/sqlc.json
new file mode 100644
index 0000000000..ac7c2ed829
--- /dev/null
+++ b/internal/endtoend/testdata/cte_in_delete/stdlib/sqlc.json
@@ -0,0 +1,11 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}