@quereus/quereus 0.1.0 → 0.2.1

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

@@ -2,12 +2,14 @@ import type * as AST from '../../parser/ast.js';
 import type { RelationalPlanNode } from '../nodes/plan-node.js';
 import type { PlanningContext } from '../planning-context.js';
 import type { Projection } from '../nodes/project-node.js';
+import { RegisteredScope } from '../scopes/registered.js';
 /**
  * Builds final projections for non-aggregate cases
  */
-export declare function buildFinalProjections(input: RelationalPlanNode, projections: Projection[], selectScope: any, stmt: AST.SelectStmt, selectContext: PlanningContext): {
+export declare function buildFinalProjections(input: RelationalPlanNode, projections: Projection[], selectScope: any, stmt: AST.SelectStmt, selectContext: PlanningContext, preserveInputColumns?: boolean): {
     output: RelationalPlanNode;
     finalContext: PlanningContext;
+    projectionScope?: RegisteredScope;
     preAggregateSort: boolean;
 };
 /**
@@ -17,9 +19,9 @@ export declare function applyDistinct(input: RelationalPlanNode, stmt: AST.Selec
 /**
  * Applies ORDER BY clause if not already applied
  */
-export declare function applyOrderBy(input: RelationalPlanNode, stmt: AST.SelectStmt, selectContext: PlanningContext, preAggregateSort: boolean): RelationalPlanNode;
+export declare function applyOrderBy(input: RelationalPlanNode, stmt: AST.SelectStmt, selectContext: PlanningContext, preAggregateSort: boolean, projectionScope?: RegisteredScope): RelationalPlanNode;
 /**
  * Applies LIMIT and OFFSET clauses
  */
-export declare function applyLimitOffset(input: RelationalPlanNode, stmt: AST.SelectStmt, selectContext: PlanningContext): RelationalPlanNode;
+export declare function applyLimitOffset(input: RelationalPlanNode, stmt: AST.SelectStmt, selectContext: PlanningContext, projectionScope?: RegisteredScope): RelationalPlanNode;
 //# sourceMappingURL=select-modifiers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"select-modifiers.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-modifiers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAW3D;;GAEG;AACH,wBAAgB,qBAAqB,CACpC,KAAK,EAAE,kBAAkB,EACzB,WAAW,EAAE,UAAU,EAAE,EACzB,WAAW,EAAE,GAAG,EAChB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,GAC5B;IACF,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,EAAE,eAAe,CAAC;IAC9B,gBAAgB,EAAE,OAAO,CAAC;CAC1B,CA0CA;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC5B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,WAAW,EAAE,GAAG,GACd,kBAAkB,CAKpB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC3B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,EAC9B,gBAAgB,EAAE,OAAO,GACvB,kBAAkB,CAcpB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,GAC5B,kBAAkB,CAQpB"}
+{"version":3,"file":"select-modifiers.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-modifiers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAO3D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI1D;;GAEG;AACH,wBAAgB,qBAAqB,CACpC,KAAK,EAAE,kBAAkB,EACzB,WAAW,EAAE,UAAU,EAAE,EACzB,WAAW,EAAE,GAAG,EAChB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,EAC9B,oBAAoB,GAAE,OAAc,GAClC;IACF,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,EAAE,eAAe,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,gBAAgB,EAAE,OAAO,CAAC;CAC1B,CAsCA;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC5B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,WAAW,EAAE,GAAG,GACd,kBAAkB,CAKpB;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC3B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,EAC9B,gBAAgB,EAAE,OAAO,EACzB,eAAe,CAAC,EAAE,eAAe,GAC/B,kBAAkB,CAqBpB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,aAAa,EAAE,eAAe,EAC9B,eAAe,CAAC,EAAE,eAAe,GAC/B,kBAAkB,CAepB"}

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

@@ -10,15 +10,15 @@ import { buildExpression } from './expression.js';
 /**
  * Builds final projections for non-aggregate cases
  */
-export function buildFinalProjections(input, projections, selectScope, stmt, selectContext) {
+export function buildFinalProjections(input, projections, selectScope, stmt, selectContext, preserveInputColumns = true) {
     if (projections.length === 0) {
         return { output: input, finalContext: selectContext, preAggregateSort: false };
     }
-    // Check if ORDER BY should be applied before projection
+    // Check if ORDER BY should be applied before projection (using input scope only)
     const needsPreProjectionSort = shouldApplyOrderByBeforeProjection(stmt, projections);
     let preAggregateSort = false;
     let currentInput = input;
-    // Apply ORDER BY before projection if needed
+    // Apply ORDER BY before projection if needed (compile expressions against input scope)
     if (needsPreProjectionSort && stmt.orderBy && stmt.orderBy.length > 0) {
         const sortKeys = stmt.orderBy.map(orderByClause => {
             const expression = buildExpression(selectContext, orderByClause.expr);
@@ -31,18 +31,15 @@ export function buildFinalProjections(input, projections, selectScope, stmt, sel
         currentInput = new SortNode(selectScope, currentInput, sortKeys);
         preAggregateSort = true;
     }
-    currentInput = new ProjectNode(selectScope, currentInput, projections);
-    // Create a new scope that maps column names to the ProjectNode's output attributes
+    // Create the ProjectNode only after all expressions are compiled against input scope
+    currentInput = new ProjectNode(selectScope, currentInput, projections, undefined, undefined, preserveInputColumns);
+    // Create projection output scope but DON'T merge it into finalContext yet
+    // Let the caller decide when to make these output attributes visible
     const projectionOutputScope = createProjectionOutputScope(currentInput);
-    // Update selectContext to use BOTH the projection output scope AND the original scope
-    let finalContext = selectContext;
-    if (!needsPreProjectionSort) {
-        const combinedScope = new MultiScope([projectionOutputScope, selectScope]);
-        finalContext = { ...selectContext, scope: combinedScope };
-    }
     return {
         output: currentInput,
-        finalContext,
+        finalContext: selectContext, // Keep unchanged - no premature scope pollution
+        projectionScope: projectionOutputScope,
         preAggregateSort
     };
 }
@@ -58,29 +55,41 @@ export function applyDistinct(input, stmt, selectScope) {
 /**
  * Applies ORDER BY clause if not already applied
  */
-export function applyOrderBy(input, stmt, selectContext, preAggregateSort) {
+export function applyOrderBy(input, stmt, selectContext, preAggregateSort, projectionScope) {
     if (stmt.orderBy && stmt.orderBy.length > 0 && !preAggregateSort) {
+        // Merge projection scope if available so ORDER BY can reference output column aliases
+        let orderByContext = selectContext;
+        if (projectionScope) {
+            const combinedScope = new MultiScope([projectionScope, selectContext.scope]);
+            orderByContext = { ...selectContext, scope: combinedScope };
+        }
         const sortKeys = stmt.orderBy.map(orderByClause => {
-            const expression = buildExpression(selectContext, orderByClause.expr);
+            const expression = buildExpression(orderByContext, orderByClause.expr);
             return {
                 expression,
                 direction: orderByClause.direction,
                 nulls: orderByClause.nulls
             };
         });
-        return new SortNode(selectContext.scope, input, sortKeys);
+        return new SortNode(orderByContext.scope, input, sortKeys);
     }
     return input;
 }
 /**
  * Applies LIMIT and OFFSET clauses
  */
-export function applyLimitOffset(input, stmt, selectContext) {
+export function applyLimitOffset(input, stmt, selectContext, projectionScope) {
     if (stmt.limit || stmt.offset) {
-        const literalNull = new LiteralNode(selectContext.scope, { type: 'literal', value: null });
-        const limitExpression = stmt.limit ? buildExpression(selectContext, stmt.limit) : literalNull;
-        const offsetExpression = stmt.offset ? buildExpression(selectContext, stmt.offset) : literalNull;
-        return new LimitOffsetNode(selectContext.scope, input, limitExpression, offsetExpression);
+        // Merge projection scope if available so LIMIT/OFFSET can reference output column aliases
+        let limitContext = selectContext;
+        if (projectionScope) {
+            const combinedScope = new MultiScope([projectionScope, selectContext.scope]);
+            limitContext = { ...selectContext, scope: combinedScope };
+        }
+        const literalNull = new LiteralNode(limitContext.scope, { type: 'literal', value: null });
+        const limitExpression = stmt.limit ? buildExpression(limitContext, stmt.limit) : literalNull;
+        const offsetExpression = stmt.offset ? buildExpression(limitContext, stmt.offset) : literalNull;
+        return new LimitOffsetNode(limitContext.scope, input, limitExpression, offsetExpression);
     }
     return input;
 }

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

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

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

@@ -3,6 +3,8 @@ import { type ScalarPlanNode } from '../nodes/plan-node.js';
 import type { PlanningContext } from '../planning-context.js';
 import type { Projection } from '../nodes/project-node.js';
 import { WindowFunctionCallNode } from '../nodes/window-function.js';
+import { type RelationalPlanNode } from '../nodes/plan-node.js';
+import type { Scope } from '../scopes/scope.js';
 /**
  * Checks if an expression contains aggregate functions
  */
@@ -17,7 +19,7 @@ export declare function isWindowExpression(node: ScalarPlanNode): boolean;
 export declare function buildStarProjections(column: {
     type: 'all';
     table?: string;
-}, input: any, selectScope: any): Projection[];
+}, source: RelationalPlanNode, selectScope: Scope): Projection[];
 /**
  * Analyzes SELECT columns and categorizes them into different types
  */

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;AAO3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE;;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,KAAK,EAAE,GAAG,EACV,WAAW,EAAE,GAAG,GACd,UAAU,EAAE,CAwCd;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CACnC,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE,EAC3B,aAAa,EAAE,eAAe,GAC5B;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;CAC5B,CA2CA"}
+{"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;AAO3D,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;AAEhD;;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;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CACnC,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE,EAC3B,aAAa,EAAE,eAAe,GAC5B;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;CAC5B,CA2CA"}

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

@@ -40,32 +40,27 @@ export function isWindowExpression(node) {
 /**
  * Builds projections for SELECT * or table.*
  */
-export function buildStarProjections(column, input, selectScope) {
-    const projections = [];
-    const inputColumns = input.getType().columns;
-    const inputAttributes = input.getAttributes();
-    if (column.table) {
-        // Handle qualified SELECT table.*
-        const inputTableName = input.source?.tableSchema?.name;
-        const tableMatches = column.table.toLowerCase() === inputTableName?.toLowerCase();
-        if (!tableMatches) {
-            throw new QuereusError(`Table '${column.table}' not found in FROM clause for qualified SELECT *`, StatusCode.ERROR);
-        }
+export function buildStarProjections(column, source, selectScope) {
+    const allAttributes = source.getAttributes();
+    // Filter by relation name if qualified (e.g., SELECT t1.*)
+    const matchingAttributes = column.table
+        ? allAttributes.filter(attr => attr.relationName && attr.relationName.toLowerCase() === column.table.toLowerCase())
+        : allAttributes;
+    if (column.table && matchingAttributes.length === 0) {
+        throw new QuereusError(`Table '${column.table}' not found in FROM clause for qualified SELECT *`, StatusCode.ERROR);
     }
-    // Add a projection for each column in the input relation
-    inputColumns.forEach((columnDef, index) => {
+    // Convert to projections
+    return matchingAttributes.map((attr, index) => {
         const columnExpr = {
             type: 'column',
-            name: columnDef.name,
+            name: attr.name,
         };
-        const attr = inputAttributes[index];
-        const columnRef = new ColumnReferenceNode(selectScope, columnExpr, columnDef.type, attr.id, index);
-        projections.push({
+        const columnRef = new ColumnReferenceNode(selectScope, columnExpr, attr.type, attr.id, index);
+        return {
             node: columnRef,
-            alias: columnDef.name
-        });
+            alias: attr.name
+        };
     });
-    return projections;
 }
 /**
  * Analyzes SELECT columns and categorizes them into different types

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.map

@@ -1 +1 @@
-{"version":3,"file":"select-window.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-window.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,uBAAuB,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAMrE,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAEhD;;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,CAkEpB"}
+{"version":3,"file":"select-window.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-window.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,uBAAuB,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAMrE,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAEhD;;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,CAqEpB"}

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

@@ -28,12 +28,15 @@ export function buildWindowPhase(input, windowFunctions, selectContext, stmt) {
             // TODO: Replace with SequencingNode for optimal performance
             // For now, proceed with WindowNode
         }
-        // Create new WindowFunctionCallNode instances with alias information
-        const windowFuncsWithAlias = functions.map(({ func, alias }) => new WindowFunctionCallNode(func.scope, func.expression, func.functionName, func.isDistinct, alias));
-        // Build expressions for window specification
+        // CRITICAL: Build window specification expressions using the INPUT scope
+        // This ensures expressions reference the correct input attribute IDs,
+        // not premature output attribute IDs that don't exist in the runtime context
         const partitionExpressions = windowSpec.partitionBy.map(expr => buildExpression(selectContext, expr, false));
         const orderByExpressions = windowSpec.orderBy.map(orderClause => buildExpression(selectContext, orderClause.expr, false));
+        // Create new WindowFunctionCallNode instances with alias information
+        const windowFuncsWithAlias = functions.map(({ func, alias }) => new WindowFunctionCallNode(func.scope, func.expression, func.functionName, func.isDistinct, alias));
         const functionArguments = buildWindowFunctionArguments(windowFuncsWithAlias, selectContext);
+        // Now create the WindowNode with pre-compiled expressions
         currentInput = new WindowNode(selectContext.scope, currentInput, windowSpec, windowFuncsWithAlias, partitionExpressions, orderByExpressions, functionArguments);
     }
     // Create projections that select only the requested columns using direct array indexing

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

@@ -1 +1 @@
-{"version":3,"file":"select-window.js","sourceRoot":"","sources":["../../../../src/planner/building/select-window.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAmB,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAC/B,KAAyB,EACzB,eAAmE,EACnE,aAA8B,EAC9B,IAAoB;IAEpB,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI,YAAY,GAAG,KAAK,CAAC;IAEzB,uDAAuD;IACvD,MAAM,YAAY,GAAG,0BAA0B,CAAC,eAAe,CAAC,CAAC;IAEjE,yDAAyD;IACzD,KAAK,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC,IAAI,YAAY,EAAE,CAAC;QACxD,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAe;YAC9B,WAAW,EAAE,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,WAAW,IAAI,EAAE;YAChE,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE;YACxD,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK;SAC9C,CAAC;QAEF,+EAA+E;QAC/E,IAAI,uBAAuB,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,CAAC;YACpD,4DAA4D;YAC5D,mCAAmC;QACpC,CAAC;QAED,qEAAqE;QACrE,MAAM,oBAAoB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAC9D,IAAI,sBAAsB,CACzB,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,UAAU,EACf,KAAK,CACL,CACD,CAAC;QAEF,6CAA6C;QAC7C,MAAM,oBAAoB,GAAG,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAC9D,eAAe,CAAC,aAAa,EAAE,IAAI,EAAE,KAAK,CAAC,CAC3C,CAAC;QAEF,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAC/D,eAAe,CAAC,aAAa,EAAE,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CACvD,CAAC;QAEF,MAAM,iBAAiB,GAAG,4BAA4B,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAC;QAE5F,YAAY,GAAG,IAAI,UAAU,CAC5B,aAAa,CAAC,KAAK,EACnB,YAAY,EACZ,UAAU,EACV,oBAAoB,EACpB,oBAAoB,EACpB,kBAAkB,EAClB,iBAAiB,CACjB,CAAC;IACH,CAAC;IAED,wFAAwF;IACxF,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,IAAI,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAErG,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,YAAY,GAAG,IAAI,WAAW,CAAC,aAAa,CAAC,KAAK,EAAE,YAAY,EAAE,iBAAiB,CAAC,CAAC;IACtF,CAAC;IAED,OAAO,YAAY,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,SAAS,0BAA0B,CAClC,eAAmE;IAEnE,MAAM,YAAY,GAAG,IAAI,GAAG,EAA8D,CAAC;IAE3F,KAAK,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,eAAe,EAAE,CAAC;QAC/C,iDAAiD;QACjD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC;YACpC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,WAAW,IAAI,EAAE;YACtD,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE;YAC9C,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK;SACpC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YACtC,YAAY,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QACrC,CAAC;QACD,YAAY,CAAC,GAAG,CAAC,aAAa,CAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,YAAY,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,SAAS,uBAAuB,CAC/B,SAA6D,EAC7D,UAAsB;IAEtB,OAAO,SAAS,CAAC,MAAM,KAAK,CAAC;QACzB,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,YAAY;QAC7D,UAAU,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,CAAC;AACzC,CAAC;AAED;;GAEG;AACH,SAAS,4BAA4B,CACpC,oBAA8C,EAC9C,aAA8B;IAE9B,OAAO,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACtC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC/E,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjD,OAAO,eAAe,CAAC,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACvD,CAAC;QACD,2EAA2E;QAC3E,IAAI,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,OAAO;YAC9C,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7C,wFAAwF;YACxF,OAAO,IAAI,WAAW,CAAC,aAAa,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,sBAAsB,CAC9B,IAAoB,EACpB,UAA8B,EAC9B,aAA8B,EAC9B,eAAmE;IAEnE,MAAM,iBAAiB,GAAiB,EAAE,CAAC;IAC3C,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;IACxC,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;IAE7E,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACnC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,IAAI,kBAAkB,CAAC,eAAe,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;gBAC3E,+EAA+E;gBAC/E,MAAM,iBAAiB,GAAG,uBAAuB,CAChD,MAAM,EACN,aAAa,EACb,eAAe,EACf,iBAAiB,CACjB,CAAC;gBAEF,IAAI,iBAAiB,IAAI,CAAC,EAAE,CAAC;oBAC5B,MAAM,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC;oBAEpE,MAAM,cAAc,GAAG,IAAI,cAAc,CACxC,aAAa,CAAC,KAAK,EACnB,iBAAiB,EACjB,gBAAgB,CAChB,CAAC;oBAEF,iBAAiB,CAAC,IAAI,CAAC;wBACtB,IAAI,EAAE,cAAc;wBACpB,KAAK,EAAE,MAAM,CAAC,KAAK;qBACnB,CAAC,CAAC;gBACJ,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,uFAAuF;gBACvF,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAErE,iBAAiB,CAAC,IAAI,CAAC;oBACtB,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,MAAM,CAAC,KAAK;iBACnB,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,SAAS,uBAAuB,CAC/B,MAA4B,EAC5B,aAA8B,EAC9B,eAAmE,EACnE,iBAAyB;IAEzB,MAAM,YAAY,GAAG,eAAe,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAEvE,MAAM,uBAAuB,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;QACtE,qEAAqE;QACrE,IAAI,CAAC,CAAC,YAAY,YAAY,sBAAsB,CAAC;YACpD,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC;YAC9E,OAAO,KAAK,CAAC;QACd,CAAC;QAED,qFAAqF;QACrF,MAAM,cAAc,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC;QACtD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QAE1C,OAAO,kBAAkB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,OAAO,uBAAuB,IAAI,CAAC,CAAC,CAAC,CAAC,iBAAiB,GAAG,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACxF,CAAC;AAED;;GAEG;AACH,SAAS,kBAAkB,CAAC,cAAmB,EAAE,UAAe;IAC/D,gCAAgC;IAChC,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC;IAC5E,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC;IAEpE,4BAA4B;IAC5B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;IAE5D,+BAA+B;IAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC;IACpE,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC;IAE5D,OAAO,iBAAiB,KAAK,aAAa;QACtC,aAAa,KAAK,SAAS;QAC3B,aAAa,KAAK,SAAS,CAAC;AACjC,CAAC"}
+{"version":3,"file":"select-window.js","sourceRoot":"","sources":["../../../../src/planner/building/select-window.ts"],"names":[],"mappings":"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"}

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

@@ -7,7 +7,7 @@ import { ValuesNode } from '../nodes/values-node.js';
  * Creates an initial logical query plan for a SELECT statement.
  *
  * For this initial version, it only supports simple "SELECT ... FROM one_table" queries,
- * effectively returning a TableScanNode for that table.
+ * effectively returning a TableReferenceNode for that table.
  *
  * @param stmt The AST.SelectStmt to plan.
  * @param ctx The parent planning context for this SELECT statement.
@@ -15,7 +15,14 @@ import { ValuesNode } from '../nodes/values-node.js';
  * @returns A BatchNode representing the plan for the SELECT statement.
  * @throws {QuereusError} If the FROM clause is missing, empty, or contains more than one source.
  */
-export declare function buildSelectStmt(ctx: PlanningContext, stmt: AST.SelectStmt, parentCTEs?: Map<string, CTEPlanNode>): PlanNode;
+export declare function buildSelectStmt(ctx: PlanningContext, stmt: AST.SelectStmt, parentCTEs?: Map<string, CTEPlanNode>, 
+/**
+ * Whether ProjectNodes inside this SELECT should forward all input columns that are not explicitly
+ * listed in the projection list. This is desirable for top-level queries (helps ORDER BY, window
+ * functions, etc.) but must be switched off for scalar/IN/EXISTS sub-queries which are required to
+ * expose only their declared columns.
+ */
+preserveInputColumns?: boolean): PlanNode;
 /**
  * Creates a plan for a VALUES statement.
  *
@@ -24,5 +31,21 @@ export declare function buildSelectStmt(ctx: PlanningContext, stmt: AST.SelectSt
  * @returns A ValuesNode representing the VALUES clause
  */
 export declare function buildValuesStmt(ctx: PlanningContext, stmt: AST.ValuesStmt): ValuesNode;
+/**
+ * Processes a FROM clause item into a relational plan node.
+ *
+ * Handles different types of FROM items:
+ * - Table references - creates a TableReferenceNode
+ * - Subqueries - plans the subquery
+ * - Joins - builds the join structure
+ * - Table functions - creates a table function call node
+ *
+ * For a simple table reference, this calls buildTableReference which
+ * returns a TableReferenceNode for that table.
+ *
+ * @param fromClause The FROM clause AST node to process
+ * @param ctx The planning context
+ * @returns A relational plan node representing the FROM clause
+ */
 export declare function buildFrom(fromClause: AST.FromClause, parentContext: PlanningContext, cteNodes?: Map<string, CTEPlanNode>): RelationalPlanNode;
 //# sourceMappingURL=select.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAuB,MAAM,uBAAuB,CAAC;AAG/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAY9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAcrD;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAa,GAC/C,QAAQ,CA6FV;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC9B,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,GAAG,CAAC,UAAU,GAClB,UAAU,CAQZ;AAED,wBAAgB,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAa,GAAG,kBAAkB,CA0KxJ"}
+{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAuB,MAAM,uBAAuB,CAAC;AAG/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAa9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAkBrD;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAa;AAChD;;;;;GAKG;AACH,oBAAoB,GAAE,OAAc,GACnC,QAAQ,CAsJV;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC9B,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,GAAG,CAAC,UAAU,GAClB,UAAU,CAQZ;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,QAAQ,GAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAa,GAAG,kBAAkB,CAyNxJ"}

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

@@ -1,7 +1,7 @@
 import { QuereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
 import { SingleRowNode } from '../nodes/single-row.js';
-import { buildTableScan } from './table.js';
+import { buildTableReference } from './table.js';
 import { AliasedScope } from '../scopes/aliased.js';
 import { RegisteredScope } from '../scopes/registered.js';
 import { MultiScope } from '../scopes/multi.js';
@@ -10,9 +10,11 @@ import { buildExpression } from './expression.js';
 import { FilterNode } from '../nodes/filter.js';
 import { buildTableFunctionCall } from './table-function.js';
 import { CTEReferenceNode } from '../nodes/cte-reference-node.js';
+import { InternalRecursiveCTERefNode } from '../nodes/internal-recursive-cte-ref-node.js';
 import { JoinNode } from '../nodes/join-node.js';
 import { ColumnReferenceNode } from '../nodes/reference.js';
 import { ValuesNode } from '../nodes/values-node.js';
+import { createLogger } from '../../common/logger.js';
 // Import decomposed functionality
 import { buildWithContext } from './select-context.js';
 import { buildCompoundSelect } from './select-compound.js';
@@ -20,14 +22,16 @@ import { analyzeSelectColumns, buildStarProjections } from './select-projections
 import { buildAggregatePhase, buildFinalAggregateProjections } from './select-aggregates.js';
 import { buildWindowPhase } from './select-window.js';
 import { buildFinalProjections, applyDistinct, applyOrderBy, applyLimitOffset } from './select-modifiers.js';
+import { SortNode } from '../nodes/sort.js';
 import { buildInsertStmt } from './insert.js';
 import { buildUpdateStmt } from './update.js';
 import { buildDeleteStmt } from './delete.js';
+const logger = createLogger('planner:cte');
 /**
  * Creates an initial logical query plan for a SELECT statement.
  *
  * For this initial version, it only supports simple "SELECT ... FROM one_table" queries,
- * effectively returning a TableScanNode for that table.
+ * effectively returning a TableReferenceNode for that table.
  *
  * @param stmt The AST.SelectStmt to plan.
  * @param ctx The parent planning context for this SELECT statement.
@@ -35,7 +39,14 @@ import { buildDeleteStmt } from './delete.js';
  * @returns A BatchNode representing the plan for the SELECT statement.
  * @throws {QuereusError} If the FROM clause is missing, empty, or contains more than one source.
  */
-export function buildSelectStmt(ctx, stmt, parentCTEs = new Map()) {
+export function buildSelectStmt(ctx, stmt, parentCTEs = new Map(), 
+/**
+ * Whether ProjectNodes inside this SELECT should forward all input columns that are not explicitly
+ * listed in the projection list. This is desirable for top-level queries (helps ORDER BY, window
+ * functions, etc.) but must be switched off for scalar/IN/EXISTS sub-queries which are required to
+ * expose only their declared columns.
+ */
+preserveInputColumns = true) {
     // Phase 0: Handle WITH clause if present
     const { contextWithCTEs, cteNodes } = buildWithContext(ctx, stmt, parentCTEs);
     // Handle compound set operations (UNION / INTERSECT / EXCEPT)
@@ -83,22 +94,74 @@ export function buildSelectStmt(ctx, stmt, parentCTEs = new Map()) {
         // Build final projections if needed
         if (aggregateResult.needsFinalProjection) {
             const finalProjections = buildFinalAggregateProjections(stmt, selectContext, aggregateResult.aggregateScope);
-            input = new ProjectNode(selectScope, input, finalProjections);
+            input = new ProjectNode(selectScope, input, finalProjections, undefined, undefined, preserveInputColumns);
         }
     }
     // Handle window functions if present
-    input = buildWindowPhase(input, windowFunctions, selectContext, stmt);
-    // Handle final projections for non-aggregate cases
+    if (hasWindowFunctions) {
+        // Check if ORDER BY references columns not in SELECT before applying window functions
+        let preWindowSort = false;
+        if (stmt.orderBy) {
+            const selectedColumns = new Set();
+            for (const column of stmt.columns) {
+                if (column.type === 'column' && column.expr.type === 'column') {
+                    selectedColumns.add(column.expr.name.toLowerCase());
+                }
+                if (column.type === 'column' && column.alias) {
+                    selectedColumns.add(column.alias.toLowerCase());
+                }
+            }
+            // Check if ORDER BY references columns not in SELECT
+            for (const orderByClause of stmt.orderBy) {
+                if (orderByClause.expr.type === 'column') {
+                    const orderColumn = orderByClause.expr.name.toLowerCase();
+                    if (!selectedColumns.has(orderColumn)) {
+                        // Apply ORDER BY before window projections
+                        const sortKeys = stmt.orderBy.map(orderBy => ({
+                            expression: buildExpression(selectContext, orderBy.expr),
+                            direction: orderBy.direction,
+                            nulls: orderBy.nulls
+                        }));
+                        input = new SortNode(selectContext.scope, input, sortKeys);
+                        preWindowSort = true;
+                        break;
+                    }
+                }
+            }
+        }
+        input = buildWindowPhase(input, windowFunctions, selectContext, stmt);
+        // Update context to include window output columns
+        const windowOutputScope = new RegisteredScope(selectContext.scope);
+        const windowAttributes = input.getAttributes();
+        input.getType().columns.forEach((col, index) => {
+            const attr = windowAttributes[index];
+            windowOutputScope.registerSymbol(col.name.toLowerCase(), (exp, s) => new ColumnReferenceNode(s, exp, col.type, attr.id, index));
+        });
+        // Create combined scope that includes both original columns and window output
+        const combinedScope = new MultiScope([windowOutputScope, selectScope]);
+        selectContext = { ...selectContext, scope: combinedScope };
+        // Don't apply ORDER BY again if we already did it
+        if (preWindowSort) {
+            preAggregateSort = true;
+        }
+    }
+    // Handle final projections for non-aggregate, non-window cases
     if (!hasAggregates && !hasWindowFunctions) {
-        const finalResult = buildFinalProjections(input, projections, selectScope, stmt, selectContext);
+        const finalResult = buildFinalProjections(input, projections, selectScope, stmt, selectContext, preserveInputColumns);
         input = finalResult.output;
         selectContext = finalResult.finalContext;
         preAggregateSort = finalResult.preAggregateSort;
+        // Apply final modifiers with projection scope for column alias resolution
+        input = applyDistinct(input, stmt, selectScope);
+        input = applyOrderBy(input, stmt, selectContext, preAggregateSort, finalResult.projectionScope);
+        input = applyLimitOffset(input, stmt, selectContext, finalResult.projectionScope);
+    }
+    else {
+        // Apply final modifiers without projection scope for aggregate/window cases
+        input = applyDistinct(input, stmt, selectScope);
+        input = applyOrderBy(input, stmt, selectContext, preAggregateSort);
+        input = applyLimitOffset(input, stmt, selectContext);
     }
-    // Apply final modifiers
-    input = applyDistinct(input, stmt, selectScope);
-    input = applyOrderBy(input, stmt, selectContext, preAggregateSort);
-    input = applyLimitOffset(input, stmt, selectContext);
     return input;
 }
 /**
@@ -114,6 +177,22 @@ export function buildValuesStmt(ctx, stmt) {
     // Create the VALUES node
     return new ValuesNode(ctx.scope, rows);
 }
+/**
+ * Processes a FROM clause item into a relational plan node.
+ *
+ * Handles different types of FROM items:
+ * - Table references - creates a TableReferenceNode
+ * - Subqueries - plans the subquery
+ * - Joins - builds the join structure
+ * - Table functions - creates a table function call node
+ *
+ * For a simple table reference, this calls buildTableReference which
+ * returns a TableReferenceNode for that table.
+ *
+ * @param fromClause The FROM clause AST node to process
+ * @param ctx The planning context
+ * @returns A relational plan node representing the FROM clause
+ */
 export function buildFrom(fromClause, parentContext, cteNodes = new Map()) {
     let fromTable;
     let columnScope;
@@ -122,21 +201,65 @@ export function buildFrom(fromClause, parentContext, cteNodes = new Map()) {
         // Check if this is a CTE reference
         if (cteNodes.has(tableName)) {
             const cteNode = cteNodes.get(tableName);
-            const cteRefNode = new CTEReferenceNode(parentContext.scope, cteNode, fromClause.alias);
-            // Create scope for CTE columns
-            const cteScope = new RegisteredScope(parentContext.scope);
-            const cteAttributes = cteNode.getAttributes();
-            cteNode.getType().columns.forEach((c, i) => {
-                const attr = cteAttributes[i];
-                cteScope.registerSymbol(c.name.toLowerCase(), (exp, s) => new ColumnReferenceNode(s, exp, c.type, attr.id, i));
-            });
-            if (fromClause.alias) {
-                columnScope = new AliasedScope(cteScope, tableName, fromClause.alias.toLowerCase());
+            // Check if this is an internal recursive CTE reference
+            if (cteNode instanceof InternalRecursiveCTERefNode) {
+                // For internal recursive references, use the node directly
+                fromTable = cteNode;
+                // Create scope for internal recursive CTE columns
+                const internalScope = new RegisteredScope(parentContext.scope);
+                const internalAttributes = cteNode.getAttributes();
+                cteNode.getType().columns.forEach((c, i) => {
+                    const attr = internalAttributes[i];
+                    internalScope.registerSymbol(c.name.toLowerCase(), (exp, s) => new ColumnReferenceNode(s, exp, c.type, attr.id, i));
+                });
+                if (fromClause.alias) {
+                    columnScope = new AliasedScope(internalScope, tableName, fromClause.alias.toLowerCase());
+                }
+                else {
+                    columnScope = new AliasedScope(internalScope, tableName, tableName);
+                }
             }
             else {
-                columnScope = new AliasedScope(cteScope, tableName, tableName);
+                // Regular CTE reference - cache by CTE name + alias to ensure consistent attribute IDs
+                const cacheKey = `${tableName}:${fromClause.alias || tableName}`;
+                // Initialize cache if not exists
+                if (!parentContext.cteReferenceCache) {
+                    parentContext.cteReferenceCache = new Map();
+                }
+                let cteRefNode;
+                if (parentContext.cteReferenceCache.has(cacheKey)) {
+                    cteRefNode = parentContext.cteReferenceCache.get(cacheKey);
+                    const attrs = cteRefNode.getAttributes();
+                    logger(`Using cached CTE reference ${cacheKey}, attrs=[${attrs.map(a => a.id).join(',')}]`);
+                }
+                else {
+                    cteRefNode = new CTEReferenceNode(parentContext.scope, cteNode, fromClause.alias);
+                    parentContext.cteReferenceCache.set(cacheKey, cteRefNode);
+                    const attrs = cteRefNode.getAttributes();
+                    logger(`Created new CTE reference ${cacheKey}, attrs=[${attrs.map(a => a.id).join(',')}]`);
+                }
+                // Create scope for CTE columns using attributes from the reference node
+                // CRITICAL: Use a closure to capture the reference node's attributes
+                // This ensures all column references use the same attribute IDs
+                const cteScope = new RegisteredScope(parentContext.scope);
+                const refAttrs = cteRefNode.getAttributes();
+                cteRefNode.getType().columns.forEach((c, i) => {
+                    const attr = refAttrs[i];
+                    cteScope.registerSymbol(c.name.toLowerCase(), (exp, s) => {
+                        // Always use the cached reference node's attribute ID
+                        return new ColumnReferenceNode(s, exp, c.type, attr.id, i);
+                    });
+                });
+                if (fromClause.alias) {
+                    columnScope = new AliasedScope(cteScope, tableName, fromClause.alias.toLowerCase());
+                }
+                else {
+                    columnScope = new AliasedScope(cteScope, tableName, tableName);
+                }
+                // CRITICAL: Cache the reference node so later expression compilation uses the same attribute IDs
+                columnScope.referenceNode = cteRefNode;
+                fromTable = cteRefNode;
             }
-            fromTable = cteRefNode;
         }
         else {
             // Check if this is a view
@@ -161,7 +284,7 @@ export function buildFrom(fromClause, parentContext, cteNodes = new Map()) {
             }
             else {
                 // Regular table
-                fromTable = buildTableScan(fromClause, parentContext);
+                fromTable = buildTableReference(fromClause, parentContext);
                 // Create scope for table columns
                 const tableScope = new RegisteredScope(parentContext.scope);
                 const tableAttributes = fromTable.getAttributes();