@quereus/quereus 4.6.0 → 4.7.0

package/dist/src/planner/building/select-ordinal.d.ts

@@ -1,38 +1,83 @@
 import type * as AST from '../../parser/ast.js';
-import type { RelationalPlanNode } from '../nodes/plan-node.js';
+import type { Attribute, RelationalPlanNode, ScalarPlanNode } from '../nodes/plan-node.js';
+import type { PlanningContext } from '../planning-context.js';
 import type { Scope } from '../scopes/scope.js';
 import { ColumnReferenceNode } from '../nodes/reference.js';
 /**
- * Builds the source-order list of AST expressions for a SELECT list, with
+ * One output column of a SELECT list, in source order (stars expanded).
+ *
+ * `expr` is the AST that produced the column — the authored expression for a
+ * normal result column, or a synthesized `{type:'column', name}` for a column a
+ * star expanded to. That synthesized name is NOT a reliable handle: it is
+ * unqualified, so two same-named columns from different join sides collapse onto
+ * it. `sourceAttribute` therefore carries the exact input attribute a
+ * star-expanded column came from, so a positional reference can bind to it
+ * directly instead of re-resolving the name.
+ */
+export interface SelectListEntry {
+    /** The AST that produced this output column (authored, or synthesized for a star). */
+    readonly expr: AST.Expression;
+    /** Star-expanded entries only: the exact input attribute this column came from. */
+    readonly sourceAttribute?: {
+        readonly attr: Attribute;
+        readonly index: number;
+    };
+}
+/**
+ * Builds the source-order list of SELECT-list output columns, with
  * SELECT * / table.* expanded against the input relation's attributes.
  * Each entry corresponds to one output column, in source order. Used so that
  * GROUP BY / ORDER BY ordinal references (1-based) can resolve back to the
- * AST expression that produced the Nth output column.
+ * column that produced the Nth output column.
  */
-export declare function buildSelectListAsts(columns: AST.ResultColumn[], input: RelationalPlanNode): AST.Expression[];
+export declare function buildSelectListEntries(columns: AST.ResultColumn[], input: RelationalPlanNode): SelectListEntry[];
 /**
- * If `expr` is a bare integer literal (or a unary `-` applied to one), treats it
- * as a 1-based positional reference into `selectListAsts` and returns the
- * corresponding AST expression. Out-of-range / zero / negative ordinals raise
- * an error. Any other expression shape returns null so the caller can fall
- * through to normal expression building (e.g., `group by 1 + 0` keeps its
+ * If `expr` is a bare integer literal (or a unary `+`/`-` applied to one), treats
+ * it as a 1-based positional reference into `selectList` and returns the
+ * corresponding entry. Out-of-range / zero / negative ordinals raise an error.
+ * Any other expression shape returns null so the caller can fall through to
+ * normal expression building (e.g., `group by 1 + 0` keeps its
  * constant-expression semantics).
  */
-export declare function resolveOrdinalReference(expr: AST.Expression, selectListAsts: AST.Expression[], clauseName: 'GROUP BY' | 'ORDER BY'): AST.Expression | null;
+export declare function resolveOrdinalReference(expr: AST.Expression, selectList: readonly SelectListEntry[], clauseName: 'GROUP BY' | 'ORDER BY'): SelectListEntry | null;
+/**
+ * Builds one GROUP BY / ORDER BY term that sits *below* (or beside) the
+ * projection producing the SELECT list, so there are no output attributes to
+ * bind a positional reference to yet.
+ *
+ * A positional reference still must not go through a NAME: for a star-expanded
+ * column the synthesized name is unqualified, so `select * from t1 join t2 …
+ * group by 4` would re-resolve `v` to whichever side happens to be first in
+ * scope. When the resolved entry carries its source attribute, reference that
+ * attribute directly; otherwise re-plan the authored expression, which is what
+ * the ordinal literally stands for.
+ */
+export declare function buildOrdinalAwareExpression(context: PlanningContext, expr: AST.Expression, selectList: readonly SelectListEntry[], clauseName: 'GROUP BY' | 'ORDER BY', allowAggregates?: boolean): ScalarPlanNode;
 /**
- * Resolves a 1-based positional ORDER BY ordinal against a *compound* (set
- * operation) result. A compound has no single SELECT-list AST to map the
- * ordinal onto (each arm has its own), so `resolveOrdinalReference` does not
- * apply — instead the ordinal maps directly to the Nth OUTPUT column of the set
- * node, returning a `ColumnReferenceNode` over that column's attribute/type
- * (index `n-1`). The reference therefore inherits the column's RESOLVED type —
- * including its cross-input `collationName`/`collationSource` — so an ordinal
- * ORDER BY stays in lockstep with dedup, exactly like the column-name form.
+ * Resolves a 1-based positional ORDER BY ordinal against a relation whose output
+ * attributes ARE the SELECT list — the final `ProjectNode` of a single SELECT, or
+ * a `SetOperationNode` for a compound. The ordinal maps directly to the Nth
+ * OUTPUT column (index `n-1`), returning a `ColumnReferenceNode` over that
+ * column's attribute/type.
+ *
+ * Binding by attribute rather than by name is what makes a positional reference
+ * mean "the Nth result column" rather than "re-resolve the text that produced it":
+ * a SELECT-list alias cannot shadow the target (`select b as a, a as z … order by
+ * 2`), two same-named columns under a star cannot be confused (`select * from t1
+ * join t2 … order by 4`), and a computed column (window function, aggregate) is
+ * READ from the output rather than recomputed in a scope that cannot evaluate it.
+ * The reference also inherits the column's RESOLVED type — including a compound's
+ * cross-input `collationName`/`collationSource` — so an ordinal ORDER BY stays in
+ * lockstep with dedup, exactly like the column-name form.
+ *
+ * ORDER BY only: GROUP BY always runs BELOW the projection that produces the
+ * select list, so it has no output attributes to bind to (see
+ * {@link buildOrdinalAwareExpression}).
  *
  * Returns null for any non-ordinal expression shape (mirrors
  * `extractOrdinalValue`) so the caller falls through to normal expression
  * building. Out-of-range / zero / negative ordinals raise the same prepare-time
  * error as `resolveOrdinalReference`.
  */
-export declare function resolveCompoundOrdinalColumn(expr: AST.Expression, setNode: RelationalPlanNode, scope: Scope): ColumnReferenceNode | null;
+export declare function resolveOrdinalOutputColumn(expr: AST.Expression, outputRelation: RelationalPlanNode, scope: Scope): ColumnReferenceNode | null;
 //# sourceMappingURL=select-ordinal.d.ts.map

package/dist/src/planner/building/select-ordinal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select-ordinal.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-ordinal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAGhD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAClC,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE,EAC3B,KAAK,EAAE,kBAAkB,GACvB,GAAG,CAAC,UAAU,EAAE,CAiBlB;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACtC,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,cAAc,EAAE,GAAG,CAAC,UAAU,EAAE,EAChC,UAAU,EAAE,UAAU,GAAG,UAAU,GACjC,GAAG,CAAC,UAAU,GAAG,IAAI,CAavB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,4BAA4B,CAC3C,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,OAAO,EAAE,kBAAkB,EAC3B,KAAK,EAAE,KAAK,GACV,mBAAmB,GAAG,IAAI,CAkB5B"}
+{"version":3,"file":"select-ordinal.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-ordinal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAGhD,OAAO,KAAK,EAAE,SAAS,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D;;;;;;;;;;GAUG;AACH,MAAM,WAAW,eAAe;IAC/B,sFAAsF;IACtF,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC;IAC9B,mFAAmF;IACnF,QAAQ,CAAC,eAAe,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAChF;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACrC,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE,EAC3B,KAAK,EAAE,kBAAkB,GACvB,eAAe,EAAE,CAenB;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACtC,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,UAAU,EAAE,SAAS,eAAe,EAAE,EACtC,UAAU,EAAE,UAAU,GAAG,UAAU,GACjC,eAAe,GAAG,IAAI,CAaxB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,2BAA2B,CAC1C,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,UAAU,EAAE,SAAS,eAAe,EAAE,EACtC,UAAU,EAAE,UAAU,GAAG,UAAU,EACnC,eAAe,GAAE,OAAe,GAC9B,cAAc,CAOhB;AAeD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,0BAA0B,CACzC,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,cAAc,EAAE,kBAAkB,EAClC,KAAK,EAAE,KAAK,GACV,mBAAmB,GAAG,IAAI,CAuB5B"}

package/dist/src/planner/building/select-ordinal.js

@@ -1,75 +1,124 @@
 import { QuereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
 import { ColumnReferenceNode } from '../nodes/reference.js';
+import { buildExpression } from './expression.js';
 /**
- * Builds the source-order list of AST expressions for a SELECT list, with
+ * Builds the source-order list of SELECT-list output columns, with
  * SELECT * / table.* expanded against the input relation's attributes.
  * Each entry corresponds to one output column, in source order. Used so that
  * GROUP BY / ORDER BY ordinal references (1-based) can resolve back to the
- * AST expression that produced the Nth output column.
+ * column that produced the Nth output column.
  */
-export function buildSelectListAsts(columns, input) {
+export function buildSelectListEntries(columns, input) {
     const result = [];
     for (const column of columns) {
         if (column.type === 'all') {
             const allAttrs = input.getAttributes();
-            const matching = column.table
-                ? allAttrs.filter(attr => attr.relationName?.toLowerCase() === column.table.toLowerCase())
-                : allAttrs;
-            for (const attr of matching) {
+            allAttrs.forEach((attr, index) => {
+                if (column.table && attr.relationName?.toLowerCase() !== column.table.toLowerCase())
+                    return;
                 const colExpr = { type: 'column', name: attr.name };
-                result.push(colExpr);
-            }
+                result.push({ expr: colExpr, sourceAttribute: { attr, index } });
+            });
         }
         else if (column.type === 'column') {
-            result.push(column.expr);
+            result.push({ expr: column.expr });
         }
     }
     return result;
 }
 /**
- * If `expr` is a bare integer literal (or a unary `-` applied to one), treats it
- * as a 1-based positional reference into `selectListAsts` and returns the
- * corresponding AST expression. Out-of-range / zero / negative ordinals raise
- * an error. Any other expression shape returns null so the caller can fall
- * through to normal expression building (e.g., `group by 1 + 0` keeps its
+ * If `expr` is a bare integer literal (or a unary `+`/`-` applied to one), treats
+ * it as a 1-based positional reference into `selectList` and returns the
+ * corresponding entry. Out-of-range / zero / negative ordinals raise an error.
+ * Any other expression shape returns null so the caller can fall through to
+ * normal expression building (e.g., `group by 1 + 0` keeps its
  * constant-expression semantics).
  */
-export function resolveOrdinalReference(expr, selectListAsts, clauseName) {
+export function resolveOrdinalReference(expr, selectList, clauseName) {
     const value = extractOrdinalValue(expr);
     if (value === null)
         return null;
-    if (value < 1 || value > selectListAsts.length) {
-        throw new QuereusError(`${clauseName} position ${value} is not in the SELECT list (1..${selectListAsts.length})`, StatusCode.ERROR, undefined, expr.loc?.start.line, expr.loc?.start.column);
+    if (value < 1 || value > selectList.length) {
+        throw new QuereusError(`${clauseName} position ${value} is not in the SELECT list (1..${selectList.length})`, StatusCode.ERROR, undefined, expr.loc?.start.line, expr.loc?.start.column);
     }
-    return selectListAsts[value - 1];
+    return selectList[value - 1];
 }
 /**
- * Resolves a 1-based positional ORDER BY ordinal against a *compound* (set
- * operation) result. A compound has no single SELECT-list AST to map the
- * ordinal onto (each arm has its own), so `resolveOrdinalReference` does not
- * apply — instead the ordinal maps directly to the Nth OUTPUT column of the set
- * node, returning a `ColumnReferenceNode` over that column's attribute/type
- * (index `n-1`). The reference therefore inherits the column's RESOLVED type —
- * including its cross-input `collationName`/`collationSource` — so an ordinal
- * ORDER BY stays in lockstep with dedup, exactly like the column-name form.
+ * Builds one GROUP BY / ORDER BY term that sits *below* (or beside) the
+ * projection producing the SELECT list, so there are no output attributes to
+ * bind a positional reference to yet.
+ *
+ * A positional reference still must not go through a NAME: for a star-expanded
+ * column the synthesized name is unqualified, so `select * from t1 join t2 …
+ * group by 4` would re-resolve `v` to whichever side happens to be first in
+ * scope. When the resolved entry carries its source attribute, reference that
+ * attribute directly; otherwise re-plan the authored expression, which is what
+ * the ordinal literally stands for.
+ */
+export function buildOrdinalAwareExpression(context, expr, selectList, clauseName, allowAggregates = false) {
+    const entry = resolveOrdinalReference(expr, selectList, clauseName);
+    if (!entry) {
+        return buildExpression(context, expr, allowAggregates);
+    }
+    const sourceRef = buildSourceAttributeReference(entry, context.scope);
+    return sourceRef ?? buildExpression(context, entry.expr, allowAggregates);
+}
+/**
+ * A direct reference to a star-expanded entry's source attribute, or null when
+ * the entry is an authored expression (which must be re-planned instead).
+ */
+function buildSourceAttributeReference(entry, scope) {
+    if (!entry.sourceAttribute)
+        return null;
+    const { attr, index } = entry.sourceAttribute;
+    const colExpr = attr.relationName
+        ? { type: 'column', name: attr.name, table: attr.relationName }
+        : { type: 'column', name: attr.name };
+    return new ColumnReferenceNode(scope, colExpr, attr.type, attr.id, index);
+}
+/**
+ * Resolves a 1-based positional ORDER BY ordinal against a relation whose output
+ * attributes ARE the SELECT list — the final `ProjectNode` of a single SELECT, or
+ * a `SetOperationNode` for a compound. The ordinal maps directly to the Nth
+ * OUTPUT column (index `n-1`), returning a `ColumnReferenceNode` over that
+ * column's attribute/type.
+ *
+ * Binding by attribute rather than by name is what makes a positional reference
+ * mean "the Nth result column" rather than "re-resolve the text that produced it":
+ * a SELECT-list alias cannot shadow the target (`select b as a, a as z … order by
+ * 2`), two same-named columns under a star cannot be confused (`select * from t1
+ * join t2 … order by 4`), and a computed column (window function, aggregate) is
+ * READ from the output rather than recomputed in a scope that cannot evaluate it.
+ * The reference also inherits the column's RESOLVED type — including a compound's
+ * cross-input `collationName`/`collationSource` — so an ordinal ORDER BY stays in
+ * lockstep with dedup, exactly like the column-name form.
+ *
+ * ORDER BY only: GROUP BY always runs BELOW the projection that produces the
+ * select list, so it has no output attributes to bind to (see
+ * {@link buildOrdinalAwareExpression}).
  *
  * Returns null for any non-ordinal expression shape (mirrors
  * `extractOrdinalValue`) so the caller falls through to normal expression
  * building. Out-of-range / zero / negative ordinals raise the same prepare-time
  * error as `resolveOrdinalReference`.
  */
-export function resolveCompoundOrdinalColumn(expr, setNode, scope) {
+export function resolveOrdinalOutputColumn(expr, outputRelation, scope) {
     const value = extractOrdinalValue(expr);
     if (value === null)
         return null;
-    const columns = setNode.getType().columns;
+    // NOTE: the range is the relation's full output arity. A `SetOperationNode` that
+    // surfaces membership flag columns advertises them here too, so an ordinal could
+    // address one; harmless today because flags are introduced by optimizer rewrites,
+    // long after this runs at build time. If a flagged set-op ever reaches ORDER BY
+    // building, bound the range to the compound's data arity instead.
+    const columns = outputRelation.getType().columns;
     if (value < 1 || value > columns.length) {
         throw new QuereusError(`ORDER BY position ${value} is not in the SELECT list (1..${columns.length})`, StatusCode.ERROR, undefined, expr.loc?.start.line, expr.loc?.start.column);
     }
     const index = value - 1;
     const column = columns[index];
-    const attr = setNode.getAttributes()[index];
+    const attr = outputRelation.getAttributes()[index];
     const colExpr = { type: 'column', name: column.name || attr.name };
     return new ColumnReferenceNode(scope, colExpr, column.type, attr.id, index);
 }

package/dist/src/planner/building/select-ordinal.js.map

@@ -1 +1 @@
-{"version":3,"file":"select-ordinal.js","sourceRoot":"","sources":["../../../../src/planner/building/select-ordinal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"select-ordinal.js","sourceRoot":"","sources":["../../../../src/planner/building/select-ordinal.ts"],"names":[],"mappings":"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"}

package/dist/src/planner/building/select-projections.d.ts

@@ -30,7 +30,7 @@ export declare function buildStarProjections(column: {
  * metadata is attached to the column's `Projection` for the lineage walk.
  */
 export declare function analyzeSelectColumns(columns: AST.ResultColumn[], selectContext: PlanningContext, source: RelationalPlanNode): {
-    projections: Projection[];
+    projectionsByColumn: Map<AST.ResultColumn, Projection>;
     aggregates: {
         expression: ScalarPlanNode;
         alias: string;

package/dist/src/planner/building/select-projections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select-projections.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-projections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAM3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAKhD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAcnE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAchE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CACnC,MAAM,EAAE;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EACvC,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,KAAK,GAChB,UAAU,EAAE,CAqCd;AA+BD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CACnC,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE,EAC3B,aAAa,EAAE,eAAe,EAC9B,MAAM,EAAE,kBAAkB,GACxB;IACF,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,UAAU,EAAE;QAAE,UAAU,EAAE,cAAc,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5D,eAAe,EAAE;QAAE,IAAI,EAAE,sBAAsB,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpE,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,oBAAoB,EAAE,OAAO,CAAC;CAC9B,CAuEA"}
+{"version":3,"file":"select-projections.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-projections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAM3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAIhD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAcnE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAchE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CACnC,MAAM,EAAE;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EACvC,MAAM,EAAE,kBAAkB,EAC1B,WAAW,EAAE,KAAK,GAChB,UAAU,EAAE,CAqCd;AAqCD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CACnC,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE,EAC3B,aAAa,EAAE,eAAe,EAC9B,MAAM,EAAE,kBAAkB,GACxB;IACF,mBAAmB,EAAE,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IACvD,UAAU,EAAE;QAAE,UAAU,EAAE,cAAc,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5D,eAAe,EAAE;QAAE,IAAI,EAAE,sBAAsB,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACpE,aAAa,EAAE,OAAO,CAAC;IACvB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,oBAAoB,EAAE,OAAO,CAAC;CAC9B,CA0EA"}

package/dist/src/planner/building/select-projections.js

@@ -1,6 +1,6 @@
 import { buildExpression } from './expression.js';
 import { ColumnReferenceNode } from '../nodes/reference.js';
-import { expressionToString } from '../../emit/ast-stringify.js';
+import { expressionToString, expressionToIdentityString } from '../../emit/ast-stringify.js';
 import { QuereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
 import { CapabilityDetectors } from '../framework/characteristics.js';
@@ -69,13 +69,17 @@ export function buildStarProjections(column, source, selectScope) {
  */
 function collectInnerAggregates(node, aggregates) {
     if (CapabilityDetectors.isAggregateFunction(node)) {
-        const funcNode = node;
-        const key = expressionToString(funcNode.expression).toLowerCase();
-        // Deduplicate against existing entries
-        if (!aggregates.some(a => a.alias.toLowerCase() === key)) {
+        const key = expressionToIdentityString(node.expression);
+        // Deduplicate against existing entries by identity key rather than the alias
+        // text — the alias is the un-folded rendering, so comparing it case-blind
+        // would collapse two aggregates differing only in a quoted literal's case.
+        // The array may also hold non-aggregate entries, so the guard is a filter.
+        const alreadyPresent = aggregates.some(a => CapabilityDetectors.isAggregateFunction(a.expression) &&
+            expressionToIdentityString(a.expression.expression) === key);
+        if (!alreadyPresent) {
             aggregates.push({
-                expression: funcNode,
-                alias: expressionToString(funcNode.expression)
+                expression: node,
+                alias: expressionToString(node.expression)
             });
         }
         return; // Don't recurse into aggregate arguments
@@ -96,7 +100,10 @@ function collectInnerAggregates(node, aggregates) {
  * metadata is attached to the column's `Projection` for the lineage walk.
  */
 export function analyzeSelectColumns(columns, selectContext, source) {
-    const projections = [];
+    // Keyed by AST result column, not a flat list: the caller assembles the final
+    // projection list by walking `columns` itself so each star expands in written
+    // position (see buildSelectStmt).
+    const projectionsByColumn = new Map();
     const aggregates = [];
     const windowFunctions = [];
     let hasAggregates = false;
@@ -116,7 +123,7 @@ export function analyzeSelectColumns(columns, selectContext, source) {
             if (isWindowExpression(scalarNode)) {
                 hasWindowFunctions = true;
                 collectWindowFunctions(scalarNode, column.alias, windowFunctions);
-                projections.push({
+                projectionsByColumn.set(column, {
                     node: scalarNode,
                     alias: column.alias,
                     ...(authoredInverse ? { authoredInverse } : {})
@@ -147,7 +154,7 @@ export function analyzeSelectColumns(columns, selectContext, source) {
                 }
             }
             else {
-                projections.push({
+                projectionsByColumn.set(column, {
                     node: scalarNode,
                     alias: column.alias,
                     ...(authoredInverse ? { authoredInverse } : {})
@@ -156,7 +163,7 @@ export function analyzeSelectColumns(columns, selectContext, source) {
         }
     }
     return {
-        projections,
+        projectionsByColumn,
         aggregates,
         windowFunctions,
         hasAggregates,

package/dist/src/planner/building/select-projections.js.map

@@ -1 +1 @@
-{"version":3,"file":"select-projections.js","sourceRoot":"","sources":["../../../../src/planner/building/select-projections.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"select-projections.js","sourceRoot":"","sources":["../../../../src/planner/building/select-projections.ts"],"names":[],"mappings":"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"}

package/dist/src/planner/building/select-window.d.ts

@@ -1,12 +1,22 @@
 import type { RelationalPlanNode } from '../nodes/plan-node.js';
 import type { PlanningContext } from '../planning-context.js';
 import { WindowFunctionCallNode } from '../nodes/window-function.js';
-import type * as AST from '../../parser/ast.js';
+import { type Projection } from '../nodes/project-node.js';
+import { type GroupedWindowContext } from './select-aggregates.js';
 /**
- * Processes window functions and creates WindowNode(s) with proper projections
+ * Processes window functions and creates WindowNode(s) with proper projections.
+ *
+ * `selectListProjections` is the query's ONE select-list projection list — stars
+ * already expanded, in written order, window functions still present as raw
+ * `WindowFunctionCallNode` subtrees. It is rewritten (not rebuilt) into the
+ * projection placed above the WindowNode(s); see {@link buildWindowProjections}.
+ *
+ * `groupedWindowContext` is supplied only for a GROUPED query. The WindowNode sits
+ * ABOVE the AggregateNode, so its window specifications and function arguments run
+ * over the grouped rows and may only read what those rows carry.
  */
 export declare function buildWindowPhase(input: RelationalPlanNode, windowFunctions: {
     func: WindowFunctionCallNode;
     alias?: string;
-}[], selectContext: PlanningContext, stmt: AST.SelectStmt): RelationalPlanNode;
+}[], selectContext: PlanningContext, selectListProjections: readonly Projection[], groupedWindowContext?: GroupedWindowContext): RelationalPlanNode;
 //# sourceMappingURL=select-window.d.ts.map

package/dist/src/planner/building/select-window.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select-window.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-window.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,kBAAkB,EAAkB,MAAM,uBAAuB,CAAC;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAMrE,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAGhD;;GAEG;AACH,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,kBAAkB,EACzB,eAAe,EAAE;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACnE,aAAa,EAAE,eAAe,EAC9B,IAAI,EAAE,GAAG,CAAC,UAAU,GAClB,kBAAkB,CA4EpB"}
+{"version":3,"file":"select-window.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-window.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,kBAAkB,EAAkB,MAAM,uBAAuB,CAAC;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAIxE,OAAO,EAAmF,KAAK,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQpJ;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,kBAAkB,EACzB,eAAe,EAAE;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACnE,aAAa,EAAE,eAAe,EAC9B,qBAAqB,EAAE,SAAS,UAAU,EAAE,EAC5C,oBAAoB,CAAC,EAAE,oBAAoB,GACzC,kBAAkB,CA2GpB"}