Fix parameter inference for aliased CTE columns

Author: riordanpawley

internal/compiler/resolve.go

@@ -49,6 +49,26 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 		}
 		return nil
 	}
+	indexQueryTable := func(table *Table) error {
+		columns := make([]*catalog.Column, 0, len(table.Columns))
+		for _, column := range table.Columns {
+			columnType := ast.TypeName{Name: column.DataType}
+			if column.Type != nil {
+				columnType = *column.Type
+			}
+			columns = append(columns, &catalog.Column{
+				Name:       column.Name,
+				Type:       columnType,
+				IsNotNull:  column.NotNull,
+				IsUnsigned: column.Unsigned,
+				IsArray:    column.IsArray,
+				ArrayDims:  column.ArrayDims,
+				Comment:    column.Comment,
+				Length:     column.Length,
+			})
+		}
+		return indexTable(catalog.Table{Rel: table.Rel, Columns: columns})
+	}
 
 	for _, rv := range rvs {
 		if rv.Relname == nil {
@@ -66,8 +86,12 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 			if qc == nil {
 				continue
 			}
-			// If the table name doesn't exist, first check if it's a CTE
-			if _, qcerr := qc.GetTable(fqn); qcerr != nil {
+			// If the table name doesn't exist, first check if it's a CTE.
+			queryTable, qcerr := qc.GetTable(fqn)
+			if qcerr != nil {
+				return nil, err
+			}
+			if err := indexQueryTable(queryTable); err != nil {
 				return nil, err
 			}
 			continue

internal/endtoend/testdata/cte_filter_alias/postgresql/pgx/go/db.go

@@ -0,0 +1,7 @@
+-- name: CountRecentEvents :one
+WITH activity AS (
+  SELECT happened_at AS activity_at
+  FROM events
+)
+SELECT COUNT(*) FILTER (WHERE activity_at >= $1)::bigint AS recent_events
+FROM activity;

internal/endtoend/testdata/cte_filter_alias/postgresql/pgx/go/models.go

@@ -0,0 +1,3 @@
+CREATE TABLE events (
+  happened_at timestamptz NOT NULL
+);

internal/endtoend/testdata/cte_filter_alias/postgresql/pgx/go/query.sql.go

@@ -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"