@quereus/quereus 0.6.12 → 0.7.1

package/src/planner/building/select.ts

@@ -1,560 +1,567 @@
-import type * as AST from '../../parser/ast.js';
-import { PlanNode, type RelationalPlanNode, type ScalarPlanNode } from '../nodes/plan-node.js';
-import { QuereusError } from '../../common/errors.js';
-import { StatusCode } from '../../common/types.js';
-import type { PlanningContext } from '../planning-context.js';
-import { SingleRowNode } from '../nodes/single-row.js';
-import { buildTableReference } from './table.js';
-import { AliasedScope } from '../scopes/aliased.js';
-import { RegisteredScope } from '../scopes/registered.js';
-import type { Scope } from '../scopes/scope.js';
-import { MultiScope } from '../scopes/multi.js';
-import { ProjectNode, type Projection } from '../nodes/project-node.js';
-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 as _InternalRecursiveCTERefNode } from '../nodes/internal-recursive-cte-ref-node.js';
-import type { CTEScopeNode, CTEPlanNode } from '../nodes/cte-node.js';
-import { JoinNode } from '../nodes/join-node.js';
-import { ColumnReferenceNode } from '../nodes/reference.js';
-import { TEXT_TYPE } from '../../types/builtin-types.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';
-import { analyzeSelectColumns, buildStarProjections } from './select-projections.js';
-import { buildAggregatePhase, buildFinalAggregateProjections } from './select-aggregates.js';
-import { buildWindowPhase } from './select-window.js';
-import { buildFinalProjections, applyDistinct, applyOrderBy, applyLimitOffset } from './select-modifiers.js';
-import { SortNode, type SortKey } from '../nodes/sort.js';
-
-import { buildInsertStmt } from './insert.js';
-import { buildUpdateStmt } from './update.js';
-import { buildDeleteStmt } from './delete.js';
-import { CapabilityDetectors } from '../framework/characteristics.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 TableReferenceNode for that table.
- *
- * @param stmt The AST.SelectStmt to plan.
- * @param ctx The parent planning context for this SELECT statement.
- * @param parentCTEs A map of parent CTEs for compound statements.
- * @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: PlanningContext,
-  stmt: AST.SelectStmt,
-  parentCTEs: Map<string, CTEScopeNode> = 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: boolean = true
-): PlanNode {
-
-	// Phase 0: Handle WITH clause if present
-	const { contextWithCTEs, cteNodes } = buildWithContext(ctx, stmt, parentCTEs);
-
-	// Handle compound set operations (UNION / INTERSECT / EXCEPT)
-	if (stmt.compound) {
-		return buildCompoundSelect(stmt, contextWithCTEs, cteNodes,
-			(ctx, stmt, parentCTEs) => buildSelectStmt(ctx, stmt, parentCTEs) as RelationalPlanNode);
-	}
-
-	// Phase 1: Plan FROM clause and determine local input relations for the current select scope
-	// Use the context that includes CTEs as well as the merged CTE map so that table references
-	// inside the FROM clause can correctly resolve to CTE definitions created by the WITH clause.
-	const fromTables = !stmt.from || stmt.from.length === 0
-		? [SingleRowNode.instance]
-		: stmt.from.map(from => buildFrom(from, contextWithCTEs, cteNodes));
-
-	// Multiple FROM sources (from joins) are not supported - maybe never will be
-	if (fromTables.length > 1) {
-		throw new QuereusError(
-			'SELECT with multiple FROM sources (joins) not supported.',
-			StatusCode.UNSUPPORTED, undefined, stmt.from![1].loc?.start.line, stmt.from![1].loc?.start.column
-		);
-	}
-
-	// Phase 2: Create the main scope for this SELECT statement
-	const columnScopes = fromTables.map(ft => ctx.outputScopes.get(ft) || ft.scope).filter(Boolean);
-	const selectScope = new MultiScope([...columnScopes, contextWithCTEs.scope]);
-	let selectContext: PlanningContext = { ...contextWithCTEs, scope: selectScope };
-
-	let input: RelationalPlanNode = fromTables[0];
-
-	// Plan WHERE clause
-	if (stmt.where) {
-		const whereExpression = buildExpression(selectContext, stmt.where);
-		input = new FilterNode(selectScope, input, whereExpression);
-	}
-
-	// Build projections based on the SELECT list
-	const projections: Projection[] = [];
-
-	// Analyze SELECT columns
-	const {
-		projections: columnProjections,
-		aggregates,
-		windowFunctions,
-		hasAggregates,
-		hasWindowFunctions
-	} = analyzeSelectColumns(stmt.columns, selectContext);
-
-	// Handle SELECT * separately
-	for (const column of stmt.columns) {
-		if (column.type === 'all') {
-			const starProjections = buildStarProjections(column, input, selectScope);
-			projections.push(...starProjections);
-		}
-	}
-
-	// Add non-star projections
-	projections.push(...columnProjections);
-
-	// Process aggregates if present
-	const aggregateResult = buildAggregatePhase(input, stmt, selectContext, aggregates, hasAggregates, projections);
-	input = aggregateResult.output;
-	let preAggregateSort = aggregateResult.preAggregateSort;
-
-	// Update context if we have aggregates
-	if (aggregateResult.aggregateScope) {
-		selectContext = { ...selectContext, scope: aggregateResult.aggregateScope };
-
-		// Build final projections if needed
-		if (aggregateResult.needsFinalProjection) {
-			const finalProjections = buildFinalAggregateProjections(stmt, selectContext, aggregateResult.aggregateScope);
-			input = new ProjectNode(selectScope, input, finalProjections, undefined, undefined, preserveInputColumns);
-		}
-	}
-
-		// Handle window functions if present
-	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<string>();
-			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: SortKey[] = 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 as AST.ColumnExpr, 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, 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);
-	}
-
-	return input;
-}
-
-/**
- * Creates a plan for a VALUES statement.
- *
- * @param ctx The planning context
- * @param stmt The AST.ValuesStmt to plan
- * @returns A ValuesNode representing the VALUES clause
- */
-export function buildValuesStmt(
-	ctx: PlanningContext,
-	stmt: AST.ValuesStmt
-): ValuesNode {
-	// Build each row of values
-	const rows: ScalarPlanNode[][] = stmt.values.map(rowValues =>
-		rowValues.map(valueExpr => buildExpression(ctx, valueExpr))
-	);
-
-	// 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: AST.FromClause, parentContext: PlanningContext, cteNodes: Map<string, CTEScopeNode> = new Map()): RelationalPlanNode {
-	let fromTable: RelationalPlanNode;
-	let columnScope: Scope;
-
-	if (fromClause.type === 'table') {
-		const tableName = fromClause.table.name.toLowerCase();
-
-				// Check if this is a CTE reference
-		if (cteNodes.has(tableName)) {
-			const cteNode = cteNodes.get(tableName)!;
-
-			// Check if this is an internal recursive CTE reference
-			if (CapabilityDetectors.isRecursiveCTERef(cteNode)) {
-				// 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 as AST.ColumnExpr, c.type, attr.id, i));
-				});
-
-				if (fromClause.alias) {
-					columnScope = new AliasedScope(internalScope, tableName, fromClause.alias.toLowerCase());
-				} else {
-					columnScope = new AliasedScope(internalScope, tableName, tableName);
-				}
-			} else {
-				// 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: CTEReferenceNode;
-				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 as CTEPlanNode, 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 as AST.ColumnExpr, 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
-				// TODO: replace this monkey patching with a proper interface
-				(columnScope as any).referenceNode = cteRefNode;
-
-				fromTable = cteRefNode;
-			}
-		} else {
-			// Check if this is a view
-			const schemaName = fromClause.table.schema || parentContext.db.schemaManager.getCurrentSchemaName();
-			const viewSchema = parentContext.db.schemaManager.getView(schemaName, fromClause.table.name);
-
-			if (viewSchema) {
-				// Build the view's SELECT statement
-				let viewSelectNode = buildSelectStmt(parentContext, viewSchema.selectAst, cteNodes) as RelationalPlanNode;
-
-				// If the view has explicit column names, wrap with a projection to rename columns
-				if (viewSchema.columns && viewSchema.columns.length > 0) {
-					const viewAttributes = viewSelectNode.getAttributes();
-					const projections = viewSchema.columns.map((columnName, i) => {
-						if (i >= viewAttributes.length) {
-							throw new QuereusError(
-								`View '${viewSchema.name}' has more explicit column names than SELECT columns`,
-								StatusCode.ERROR
-							);
-						}
-						const attr = viewAttributes[i];
-						const columnRef = new ColumnReferenceNode(
-							parentContext.scope,
-							{ type: 'column', name: attr.name } as AST.ColumnExpr,
-							attr.type,
-							attr.id,
-							i
-						);
-						return {
-							node: columnRef,
-							alias: columnName
-						};
-					});
-					fromTable = new ProjectNode(parentContext.scope, viewSelectNode, projections);
-				} else {
-					fromTable = viewSelectNode;
-				}
-
-				// Create scope for view columns
-				const viewScope = new RegisteredScope(parentContext.scope);
-				const viewAttributes = fromTable.getAttributes();
-				fromTable.getType().columns.forEach((c, i) => {
-					const attr = viewAttributes[i];
-					viewScope.registerSymbol(c.name.toLowerCase(), (exp, s) =>
-						new ColumnReferenceNode(s, exp as AST.ColumnExpr, c.type, attr.id, i));
-				});
-
-				if (fromClause.alias) {
-					columnScope = new AliasedScope(viewScope, fromClause.table.name.toLowerCase(), fromClause.alias.toLowerCase());
-				} else {
-					columnScope = new AliasedScope(viewScope, fromClause.table.name.toLowerCase(), fromClause.table.name.toLowerCase());
-				}
-			} else {
-				// Regular table
-				fromTable = buildTableReference(fromClause, parentContext);
-
-				// Create scope for table columns
-				const tableScope = new RegisteredScope(parentContext.scope);
-				const tableAttributes = fromTable.getAttributes();
-				fromTable.getType().columns.forEach((c, i) => {
-					const attr = tableAttributes[i];
-					tableScope.registerSymbol(c.name.toLowerCase(), (exp, s) =>
-						new ColumnReferenceNode(s, exp as AST.ColumnExpr, c.type, attr.id, i));
-				});
-
-				if (fromClause.alias) {
-					columnScope = new AliasedScope(tableScope, fromClause.table.name.toLowerCase(), fromClause.alias.toLowerCase());
-				} else {
-					columnScope = new AliasedScope(tableScope, fromClause.table.name.toLowerCase(), fromClause.table.name.toLowerCase());
-				}
-			}
-		}
-
-	} else if (fromClause.type === 'functionSource') {
-		fromTable = buildTableFunctionCall(fromClause, parentContext);
-
-		// Create scope for function columns
-		const functionScope = new RegisteredScope(parentContext.scope);
-		const functionAttributes = fromTable.getAttributes();
-		fromTable.getType().columns.forEach((c, i) => {
-			const attr = functionAttributes[i];
-			functionScope.registerSymbol(c.name.toLowerCase(), (exp, s) =>
-				new ColumnReferenceNode(s, exp as AST.ColumnExpr, c.type, attr.id, i));
-		});
-
-		if (fromClause.alias) {
-			// Use the alias as the table name
-			columnScope = new AliasedScope(functionScope, '', fromClause.alias.toLowerCase());
-		} else {
-			// Use the function name as the table name
-			columnScope = new AliasedScope(functionScope, '', fromClause.name.name.toLowerCase());
-		}
-
-	} else if (fromClause.type === 'subquerySource') {
-		// Build the subquery
-		if (fromClause.subquery.type === 'select') {
-			fromTable = buildSelectStmt(parentContext, fromClause.subquery, cteNodes) as RelationalPlanNode;
-		} else if (fromClause.subquery.type === 'values') {
-			fromTable = buildValuesStmt(parentContext, fromClause.subquery);
-		} else {
-			const exhaustiveCheck: never = fromClause.subquery;
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-			throw new QuereusError(`Unsupported subquery type: ${(exhaustiveCheck as any).type}`, StatusCode.INTERNAL);
-		}
-
-		// Create scope for subquery columns
-		const subqueryScope = new RegisteredScope(parentContext.scope);
-		const subqueryAttributes = fromTable.getAttributes();
-
-		// Use provided column names or infer from subquery
-		const columnNames = fromClause.columns || fromTable.getType().columns.map(c => c.name);
-
-		columnNames.forEach((colName, i) => {
-			if (i < subqueryAttributes.length) {
-				const attr = subqueryAttributes[i];
-				const columnType = fromTable.getType().columns[i]?.type || { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true };
-				subqueryScope.registerSymbol(colName.toLowerCase(), (exp, s) =>
-					new ColumnReferenceNode(s, exp as AST.ColumnExpr, columnType, attr.id, i));
-			}
-		});
-
-		columnScope = new AliasedScope(subqueryScope, '', fromClause.alias.toLowerCase());
-
-	} else if (fromClause.type === 'mutatingSubquerySource') {
-		// Build the mutating subquery (DML with RETURNING)
-		let dmlNode: RelationalPlanNode;
-
-		if (fromClause.stmt.type === 'insert') {
-			// Build INSERT without SinkNode wrapper since we need the RETURNING results
-			dmlNode = buildInsertStmt(parentContext, fromClause.stmt) as RelationalPlanNode;
-		} else if (fromClause.stmt.type === 'update') {
-			// Build UPDATE without SinkNode wrapper since we need the RETURNING results
-			dmlNode = buildUpdateStmt(parentContext, fromClause.stmt) as RelationalPlanNode;
-		} else if (fromClause.stmt.type === 'delete') {
-			// Build DELETE without SinkNode wrapper since we need the RETURNING results
-			dmlNode = buildDeleteStmt(parentContext, fromClause.stmt) as RelationalPlanNode;
-		} else {
-			const exhaustiveCheck: never = fromClause.stmt;
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-			throw new QuereusError(`Unsupported mutating subquery type: ${(exhaustiveCheck as any).type}`, StatusCode.INTERNAL);
-		}
-
-		fromTable = dmlNode;
-
-		// Create scope for mutating subquery columns
-		const mutatingScope = new RegisteredScope(parentContext.scope);
-		const mutatingAttributes = fromTable.getAttributes();
-
-		// Use provided column names or infer from RETURNING clause
-		const columnNames = fromClause.columns || fromTable.getType().columns.map(c => c.name);
-
-		columnNames.forEach((colName, i) => {
-			if (i < mutatingAttributes.length) {
-				const attr = mutatingAttributes[i];
-				const columnType = fromTable.getType().columns[i]?.type || { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: false };
-				mutatingScope.registerSymbol(colName.toLowerCase(), (exp, s) =>
-					new ColumnReferenceNode(s, exp as AST.ColumnExpr, columnType, attr.id, i));
-			}
-		});
-
-		columnScope = new AliasedScope(mutatingScope, '', fromClause.alias.toLowerCase());
-
-	} else if (fromClause.type === 'join') {
-		// Handle JOIN clauses
-		return buildJoin(fromClause, parentContext, cteNodes);
-	} else {
-		// Handle the case where fromClause.type is not recognized
-		const exhaustiveCheck: never = fromClause;
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		throw new QuereusError(`Unsupported FROM clause type: ${(exhaustiveCheck as any).type}`, StatusCode.INTERNAL);
-	}
-
-	parentContext.outputScopes.set(fromTable, columnScope);
-	return fromTable;
-}
-
-/**
- * Builds a join plan node from an AST join clause
- */
-function buildJoin(joinClause: AST.JoinClause, parentContext: PlanningContext, cteNodes: Map<string, CTEScopeNode>): JoinNode {
-	// Build left and right sides recursively
-	const leftNode = buildFrom(joinClause.left, parentContext, cteNodes);
-	const rightNode = buildFrom(joinClause.right, parentContext, cteNodes);
-
-	// Create a combined scope for join expressions
-	const leftScope = parentContext.outputScopes.get(leftNode);
-	const rightScope = parentContext.outputScopes.get(rightNode);
-	if (!leftScope || !rightScope) {
-		// This should not happen if buildFrom correctly populates the scopes
-		throw new QuereusError('Could not find output scope for join source', StatusCode.INTERNAL);
-	}
-
-	// Create a combined scope for the join that includes both left and right columns
-	const combinedScope = new MultiScope([leftScope, rightScope]);
-
-	// Create a new planning context with the combined scope for condition evaluation
-	const joinContext: PlanningContext = {
-		...parentContext,
-		scope: combinedScope
-	};
-
-	let condition: ScalarPlanNode | undefined;
-	let usingColumns: string[] | undefined;
-
-	// Handle ON condition
-	if (joinClause.condition) {
-		condition = buildExpression(joinContext, joinClause.condition);
-	}
-
-	// Handle USING columns
-	if (joinClause.columns) {
-		usingColumns = joinClause.columns;
-		// Convert USING to ON condition: table1.col1 = table2.col1 AND table1.col2 = table2.col2 ...
-		// For now, store the column names and let the emitter handle the condition
-		// TODO: This could be improved by synthesizing the equality conditions here
-	}
-
-	const joinNode = new JoinNode(
-		parentContext.scope,
-		leftNode,
-		rightNode,
-		joinClause.joinType,
-		condition,
-		usingColumns
-	);
-
-	// Use the combined scope as the column scope for the join
-	// This allows both qualified and unqualified column references to resolve properly
-	parentContext.outputScopes.set(joinNode, combinedScope);
-
-	return joinNode;
-}
+import type * as AST from '../../parser/ast.js';
+import { PlanNode, type RelationalPlanNode, type ScalarPlanNode } from '../nodes/plan-node.js';
+import { QuereusError } from '../../common/errors.js';
+import { StatusCode } from '../../common/types.js';
+import type { PlanningContext } from '../planning-context.js';
+import { SingleRowNode } from '../nodes/single-row.js';
+import { buildTableReference } from './table.js';
+import { AliasedScope } from '../scopes/aliased.js';
+import { RegisteredScope } from '../scopes/registered.js';
+import type { Scope } from '../scopes/scope.js';
+import { MultiScope } from '../scopes/multi.js';
+import { ProjectNode, type Projection } from '../nodes/project-node.js';
+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 as _InternalRecursiveCTERefNode } from '../nodes/internal-recursive-cte-ref-node.js';
+import type { CTEScopeNode, CTEPlanNode } from '../nodes/cte-node.js';
+import { JoinNode } from '../nodes/join-node.js';
+import { ColumnReferenceNode } from '../nodes/reference.js';
+import { TEXT_TYPE } from '../../types/builtin-types.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';
+import { analyzeSelectColumns, buildStarProjections } from './select-projections.js';
+import { buildAggregatePhase, buildFinalAggregateProjections } from './select-aggregates.js';
+import { buildWindowPhase } from './select-window.js';
+import { buildFinalProjections, applyDistinct, applyOrderBy, applyLimitOffset } from './select-modifiers.js';
+import { SortNode, type SortKey } from '../nodes/sort.js';
+
+import { buildInsertStmt } from './insert.js';
+import { buildUpdateStmt } from './update.js';
+import { buildDeleteStmt } from './delete.js';
+import { CapabilityDetectors } from '../framework/characteristics.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 TableReferenceNode for that table.
+ *
+ * @param stmt The AST.SelectStmt to plan.
+ * @param ctx The parent planning context for this SELECT statement.
+ * @param parentCTEs A map of parent CTEs for compound statements.
+ * @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: PlanningContext,
+  stmt: AST.SelectStmt,
+  parentCTEs: Map<string, CTEScopeNode> = 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: boolean = true
+): PlanNode {
+
+	// Phase 0: Handle WITH clause if present
+	const { contextWithCTEs, cteNodes } = buildWithContext(ctx, stmt, parentCTEs);
+
+	// Handle compound set operations (UNION / INTERSECT / EXCEPT)
+	if (stmt.compound) {
+		return buildCompoundSelect(stmt, contextWithCTEs, cteNodes,
+			(ctx, stmt, parentCTEs) => buildSelectStmt(ctx, stmt, parentCTEs) as RelationalPlanNode);
+	}
+
+	// Phase 1: Plan FROM clause and determine local input relations for the current select scope
+	// Use the context that includes CTEs as well as the merged CTE map so that table references
+	// inside the FROM clause can correctly resolve to CTE definitions created by the WITH clause.
+	const fromTables = !stmt.from || stmt.from.length === 0
+		? [SingleRowNode.instance]
+		: stmt.from.map(from => buildFrom(from, contextWithCTEs, cteNodes));
+
+	// Multiple FROM sources (from joins) are not supported - maybe never will be
+	if (fromTables.length > 1) {
+		throw new QuereusError(
+			'SELECT with multiple FROM sources (joins) not supported.',
+			StatusCode.UNSUPPORTED, undefined, stmt.from![1].loc?.start.line, stmt.from![1].loc?.start.column
+		);
+	}
+
+	// Phase 2: Create the main scope for this SELECT statement
+	const columnScopes = fromTables.map(ft => ctx.outputScopes.get(ft) || ft.scope).filter(Boolean);
+	const selectScope = new MultiScope([...columnScopes, contextWithCTEs.scope]);
+	let selectContext: PlanningContext = { ...contextWithCTEs, scope: selectScope };
+
+	let input: RelationalPlanNode = fromTables[0];
+
+	// Plan WHERE clause
+	if (stmt.where) {
+		const whereExpression = buildExpression(selectContext, stmt.where);
+		input = new FilterNode(selectScope, input, whereExpression);
+	}
+
+	// Build projections based on the SELECT list
+	const projections: Projection[] = [];
+
+	// Analyze SELECT columns
+	const {
+		projections: columnProjections,
+		aggregates,
+		windowFunctions,
+		hasAggregates,
+		hasWindowFunctions
+	} = analyzeSelectColumns(stmt.columns, selectContext);
+
+	// Handle SELECT * separately
+	for (const column of stmt.columns) {
+		if (column.type === 'all') {
+			const starProjections = buildStarProjections(column, input, selectScope);
+			projections.push(...starProjections);
+		}
+	}
+
+	// Add non-star projections
+	projections.push(...columnProjections);
+
+	// Process aggregates if present
+	const aggregateResult = buildAggregatePhase(input, stmt, selectContext, aggregates, hasAggregates, projections);
+	input = aggregateResult.output;
+	let preAggregateSort = aggregateResult.preAggregateSort;
+
+	// Update context if we have aggregates
+	if (aggregateResult.aggregateScope) {
+		selectContext = { ...selectContext, scope: aggregateResult.aggregateScope };
+
+		// Build final projections if needed
+		if (aggregateResult.needsFinalProjection && aggregateResult.aggregateNode && aggregateResult.groupByExpressions) {
+			const finalProjections = buildFinalAggregateProjections(
+				stmt,
+				selectContext,
+				aggregateResult.aggregateScope,
+				aggregateResult.aggregateNode,
+				aggregates,
+				aggregateResult.groupByExpressions
+			);
+			input = new ProjectNode(selectScope, input, finalProjections, undefined, undefined, preserveInputColumns);
+		}
+	}
+
+		// Handle window functions if present
+	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<string>();
+			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: SortKey[] = 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 as AST.ColumnExpr, 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, 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);
+	}
+
+	return input;
+}
+
+/**
+ * Creates a plan for a VALUES statement.
+ *
+ * @param ctx The planning context
+ * @param stmt The AST.ValuesStmt to plan
+ * @returns A ValuesNode representing the VALUES clause
+ */
+export function buildValuesStmt(
+	ctx: PlanningContext,
+	stmt: AST.ValuesStmt
+): ValuesNode {
+	// Build each row of values
+	const rows: ScalarPlanNode[][] = stmt.values.map(rowValues =>
+		rowValues.map(valueExpr => buildExpression(ctx, valueExpr))
+	);
+
+	// 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: AST.FromClause, parentContext: PlanningContext, cteNodes: Map<string, CTEScopeNode> = new Map()): RelationalPlanNode {
+	let fromTable: RelationalPlanNode;
+	let columnScope: Scope;
+
+	if (fromClause.type === 'table') {
+		const tableName = fromClause.table.name.toLowerCase();
+
+				// Check if this is a CTE reference
+		if (cteNodes.has(tableName)) {
+			const cteNode = cteNodes.get(tableName)!;
+
+			// Check if this is an internal recursive CTE reference
+			if (CapabilityDetectors.isRecursiveCTERef(cteNode)) {
+				// 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 as AST.ColumnExpr, c.type, attr.id, i));
+				});
+
+				if (fromClause.alias) {
+					columnScope = new AliasedScope(internalScope, tableName, fromClause.alias.toLowerCase());
+				} else {
+					columnScope = new AliasedScope(internalScope, tableName, tableName);
+				}
+			} else {
+				// 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: CTEReferenceNode;
+				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 as CTEPlanNode, 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 as AST.ColumnExpr, 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
+				// TODO: replace this monkey patching with a proper interface
+				(columnScope as any).referenceNode = cteRefNode;
+
+				fromTable = cteRefNode;
+			}
+		} else {
+			// Check if this is a view
+			const schemaName = fromClause.table.schema || parentContext.db.schemaManager.getCurrentSchemaName();
+			const viewSchema = parentContext.db.schemaManager.getView(schemaName, fromClause.table.name);
+
+			if (viewSchema) {
+				// Build the view's SELECT statement
+				let viewSelectNode = buildSelectStmt(parentContext, viewSchema.selectAst, cteNodes) as RelationalPlanNode;
+
+				// If the view has explicit column names, wrap with a projection to rename columns
+				if (viewSchema.columns && viewSchema.columns.length > 0) {
+					const viewAttributes = viewSelectNode.getAttributes();
+					const projections = viewSchema.columns.map((columnName, i) => {
+						if (i >= viewAttributes.length) {
+							throw new QuereusError(
+								`View '${viewSchema.name}' has more explicit column names than SELECT columns`,
+								StatusCode.ERROR
+							);
+						}
+						const attr = viewAttributes[i];
+						const columnRef = new ColumnReferenceNode(
+							parentContext.scope,
+							{ type: 'column', name: attr.name } as AST.ColumnExpr,
+							attr.type,
+							attr.id,
+							i
+						);
+						return {
+							node: columnRef,
+							alias: columnName
+						};
+					});
+					fromTable = new ProjectNode(parentContext.scope, viewSelectNode, projections);
+				} else {
+					fromTable = viewSelectNode;
+				}
+
+				// Create scope for view columns
+				const viewScope = new RegisteredScope(parentContext.scope);
+				const viewAttributes = fromTable.getAttributes();
+				fromTable.getType().columns.forEach((c, i) => {
+					const attr = viewAttributes[i];
+					viewScope.registerSymbol(c.name.toLowerCase(), (exp, s) =>
+						new ColumnReferenceNode(s, exp as AST.ColumnExpr, c.type, attr.id, i));
+				});
+
+				if (fromClause.alias) {
+					columnScope = new AliasedScope(viewScope, fromClause.table.name.toLowerCase(), fromClause.alias.toLowerCase());
+				} else {
+					columnScope = new AliasedScope(viewScope, fromClause.table.name.toLowerCase(), fromClause.table.name.toLowerCase());
+				}
+			} else {
+				// Regular table
+				fromTable = buildTableReference(fromClause, parentContext);
+
+				// Create scope for table columns
+				const tableScope = new RegisteredScope(parentContext.scope);
+				const tableAttributes = fromTable.getAttributes();
+				fromTable.getType().columns.forEach((c, i) => {
+					const attr = tableAttributes[i];
+					tableScope.registerSymbol(c.name.toLowerCase(), (exp, s) =>
+						new ColumnReferenceNode(s, exp as AST.ColumnExpr, c.type, attr.id, i));
+				});
+
+				if (fromClause.alias) {
+					columnScope = new AliasedScope(tableScope, fromClause.table.name.toLowerCase(), fromClause.alias.toLowerCase());
+				} else {
+					columnScope = new AliasedScope(tableScope, fromClause.table.name.toLowerCase(), fromClause.table.name.toLowerCase());
+				}
+			}
+		}
+
+	} else if (fromClause.type === 'functionSource') {
+		fromTable = buildTableFunctionCall(fromClause, parentContext);
+
+		// Create scope for function columns
+		const functionScope = new RegisteredScope(parentContext.scope);
+		const functionAttributes = fromTable.getAttributes();
+		fromTable.getType().columns.forEach((c, i) => {
+			const attr = functionAttributes[i];
+			functionScope.registerSymbol(c.name.toLowerCase(), (exp, s) =>
+				new ColumnReferenceNode(s, exp as AST.ColumnExpr, c.type, attr.id, i));
+		});
+
+		if (fromClause.alias) {
+			// Use the alias as the table name
+			columnScope = new AliasedScope(functionScope, '', fromClause.alias.toLowerCase());
+		} else {
+			// Use the function name as the table name
+			columnScope = new AliasedScope(functionScope, '', fromClause.name.name.toLowerCase());
+		}
+
+	} else if (fromClause.type === 'subquerySource') {
+		// Build the subquery
+		if (fromClause.subquery.type === 'select') {
+			fromTable = buildSelectStmt(parentContext, fromClause.subquery, cteNodes) as RelationalPlanNode;
+		} else if (fromClause.subquery.type === 'values') {
+			fromTable = buildValuesStmt(parentContext, fromClause.subquery);
+		} else {
+			const exhaustiveCheck: never = fromClause.subquery;
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			throw new QuereusError(`Unsupported subquery type: ${(exhaustiveCheck as any).type}`, StatusCode.INTERNAL);
+		}
+
+		// Create scope for subquery columns
+		const subqueryScope = new RegisteredScope(parentContext.scope);
+		const subqueryAttributes = fromTable.getAttributes();
+
+		// Use provided column names or infer from subquery
+		const columnNames = fromClause.columns || fromTable.getType().columns.map(c => c.name);
+
+		columnNames.forEach((colName, i) => {
+			if (i < subqueryAttributes.length) {
+				const attr = subqueryAttributes[i];
+				const columnType = fromTable.getType().columns[i]?.type || { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: true };
+				subqueryScope.registerSymbol(colName.toLowerCase(), (exp, s) =>
+					new ColumnReferenceNode(s, exp as AST.ColumnExpr, columnType, attr.id, i));
+			}
+		});
+
+		columnScope = new AliasedScope(subqueryScope, '', fromClause.alias.toLowerCase());
+
+	} else if (fromClause.type === 'mutatingSubquerySource') {
+		// Build the mutating subquery (DML with RETURNING)
+		let dmlNode: RelationalPlanNode;
+
+		if (fromClause.stmt.type === 'insert') {
+			// Build INSERT without SinkNode wrapper since we need the RETURNING results
+			dmlNode = buildInsertStmt(parentContext, fromClause.stmt) as RelationalPlanNode;
+		} else if (fromClause.stmt.type === 'update') {
+			// Build UPDATE without SinkNode wrapper since we need the RETURNING results
+			dmlNode = buildUpdateStmt(parentContext, fromClause.stmt) as RelationalPlanNode;
+		} else if (fromClause.stmt.type === 'delete') {
+			// Build DELETE without SinkNode wrapper since we need the RETURNING results
+			dmlNode = buildDeleteStmt(parentContext, fromClause.stmt) as RelationalPlanNode;
+		} else {
+			const exhaustiveCheck: never = fromClause.stmt;
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			throw new QuereusError(`Unsupported mutating subquery type: ${(exhaustiveCheck as any).type}`, StatusCode.INTERNAL);
+		}
+
+		fromTable = dmlNode;
+
+		// Create scope for mutating subquery columns
+		const mutatingScope = new RegisteredScope(parentContext.scope);
+		const mutatingAttributes = fromTable.getAttributes();
+
+		// Use provided column names or infer from RETURNING clause
+		const columnNames = fromClause.columns || fromTable.getType().columns.map(c => c.name);
+
+		columnNames.forEach((colName, i) => {
+			if (i < mutatingAttributes.length) {
+				const attr = mutatingAttributes[i];
+				const columnType = fromTable.getType().columns[i]?.type || { typeClass: 'scalar', logicalType: TEXT_TYPE, nullable: true, isReadOnly: false };
+				mutatingScope.registerSymbol(colName.toLowerCase(), (exp, s) =>
+					new ColumnReferenceNode(s, exp as AST.ColumnExpr, columnType, attr.id, i));
+			}
+		});
+
+		columnScope = new AliasedScope(mutatingScope, '', fromClause.alias.toLowerCase());
+
+	} else if (fromClause.type === 'join') {
+		// Handle JOIN clauses
+		return buildJoin(fromClause, parentContext, cteNodes);
+	} else {
+		// Handle the case where fromClause.type is not recognized
+		const exhaustiveCheck: never = fromClause;
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		throw new QuereusError(`Unsupported FROM clause type: ${(exhaustiveCheck as any).type}`, StatusCode.INTERNAL);
+	}
+
+	parentContext.outputScopes.set(fromTable, columnScope);
+	return fromTable;
+}
+
+/**
+ * Builds a join plan node from an AST join clause
+ */
+function buildJoin(joinClause: AST.JoinClause, parentContext: PlanningContext, cteNodes: Map<string, CTEScopeNode>): JoinNode {
+	// Build left and right sides recursively
+	const leftNode = buildFrom(joinClause.left, parentContext, cteNodes);
+	const rightNode = buildFrom(joinClause.right, parentContext, cteNodes);
+
+	// Create a combined scope for join expressions
+	const leftScope = parentContext.outputScopes.get(leftNode);
+	const rightScope = parentContext.outputScopes.get(rightNode);
+	if (!leftScope || !rightScope) {
+		// This should not happen if buildFrom correctly populates the scopes
+		throw new QuereusError('Could not find output scope for join source', StatusCode.INTERNAL);
+	}
+
+	// Create a combined scope for the join that includes both left and right columns
+	const combinedScope = new MultiScope([leftScope, rightScope]);
+
+	// Create a new planning context with the combined scope for condition evaluation
+	const joinContext: PlanningContext = {
+		...parentContext,
+		scope: combinedScope
+	};
+
+	let condition: ScalarPlanNode | undefined;
+	let usingColumns: string[] | undefined;
+
+	// Handle ON condition
+	if (joinClause.condition) {
+		condition = buildExpression(joinContext, joinClause.condition);
+	}
+
+	// Handle USING columns
+	if (joinClause.columns) {
+		usingColumns = joinClause.columns;
+		// Convert USING to ON condition: table1.col1 = table2.col1 AND table1.col2 = table2.col2 ...
+		// For now, store the column names and let the emitter handle the condition
+		// TODO: This could be improved by synthesizing the equality conditions here
+	}
+
+	const joinNode = new JoinNode(
+		parentContext.scope,
+		leftNode,
+		rightNode,
+		joinClause.joinType,
+		condition,
+		usingColumns
+	);
+
+	// Use the combined scope as the column scope for the join
+	// This allows both qualified and unqualified column references to resolve properly
+	parentContext.outputScopes.set(joinNode, combinedScope);
+
+	return joinNode;
+}