@quereus/quereus 0.1.0

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

@@ -0,0 +1,164 @@
+import { AggregateNode } from '../nodes/aggregate-node.js';
+import { FilterNode } from '../nodes/filter.js';
+import { SortNode } from '../nodes/sort.js';
+import { RegisteredScope } from '../scopes/registered.js';
+import { ColumnReferenceNode } from '../nodes/reference.js';
+import { buildExpression } from './expression.js';
+import { QuereusError } from '../../common/errors.js';
+import { StatusCode } from '../../common/types.js';
+/**
+ * Processes GROUP BY, aggregates, and HAVING clauses
+ */
+export function buildAggregatePhase(input, stmt, selectContext, aggregates, hasAggregates, projections) {
+    // If there is a HAVING clause but the SELECT contains **no aggregate functions**
+    // we can safely treat the HAVING predicate as a regular filter that runs *before*
+    // the aggregation (i.e. between the source and the AggregateNode). This avoids
+    // the "missing column context" problem where the predicate refers to columns
+    // that are not available after the AggregateNode (only grouping columns and
+    // aggregate results are exposed). This behaviour is compatible with SQLite –
+    // GROUP BY with a primary-key guarantees one row per group so the semantics
+    // are unchanged.
+    const shouldPushHavingBelowAggregate = Boolean(stmt.having && !hasAggregates);
+    const hasGroupBy = stmt.groupBy && stmt.groupBy.length > 0;
+    if (!hasAggregates && !hasGroupBy) {
+        return { output: input, needsFinalProjection: false, preAggregateSort: false };
+    }
+    // ---------------------------------------------------------------------------
+    // Build HAVING predicate as *pre-aggregate* filter when appropriate
+    // ---------------------------------------------------------------------------
+    let currentInput = input;
+    if (shouldPushHavingBelowAggregate) {
+        // Build the predicate using the *pre-aggregate* scope because all columns
+        // are still available here.
+        const havingExpr = buildExpression(selectContext, stmt.having, true);
+        currentInput = new FilterNode(selectContext.scope, currentInput, havingExpr);
+    }
+    // After (optional) early HAVING filter we continue with the existing pipeline
+    // ----------------------------------------------------------------------------
+    // Handle pre-aggregate sorting for ORDER BY without GROUP BY
+    const preAggregateSort = Boolean(hasAggregates && !hasGroupBy && stmt.orderBy && stmt.orderBy.length > 0);
+    currentInput = handlePreAggregateSort(currentInput, stmt, selectContext, hasAggregates, !!hasGroupBy);
+    // Validate aggregate/non-aggregate mixing
+    validateAggregateProjections(projections, hasAggregates, !!hasGroupBy);
+    // Build GROUP BY expressions
+    const groupByExpressions = stmt.groupBy ?
+        stmt.groupBy.map(expr => buildExpression(selectContext, expr, false)) : [];
+    // Create AggregateNode
+    currentInput = new AggregateNode(selectContext.scope, currentInput, groupByExpressions, aggregates);
+    // Create aggregate output scope
+    const aggregateOutputScope = createAggregateOutputScope(selectContext.scope, currentInput, groupByExpressions, aggregates);
+    // Handle HAVING clause *after* aggregation only when we did not already push
+    // it below the AggregateNode.
+    if (stmt.having && !shouldPushHavingBelowAggregate) {
+        currentInput = buildHavingFilter(currentInput, stmt.having, selectContext, aggregateOutputScope, aggregates, groupByExpressions);
+    }
+    // Determine if final projection is needed
+    const needsFinalProjection = checkNeedsFinalProjection(projections);
+    return {
+        output: currentInput,
+        aggregateScope: aggregateOutputScope,
+        needsFinalProjection,
+        preAggregateSort
+    };
+}
+/**
+ * Handles pre-aggregate sorting for special cases
+ */
+function handlePreAggregateSort(input, stmt, selectContext, hasAggregates, hasGroupBy) {
+    // Special handling for ORDER BY with aggregates but no GROUP BY
+    if (hasAggregates && !hasGroupBy && stmt.orderBy && stmt.orderBy.length > 0) {
+        // Apply ORDER BY before aggregation
+        const sortKeys = stmt.orderBy.map(orderByClause => {
+            const expression = buildExpression(selectContext, orderByClause.expr);
+            return {
+                expression,
+                direction: orderByClause.direction,
+                nulls: orderByClause.nulls
+            };
+        });
+        return new SortNode(selectContext.scope, input, sortKeys);
+    }
+    return input;
+}
+/**
+ * Validates that aggregate and non-aggregate projections don't mix inappropriately
+ */
+function validateAggregateProjections(projections, hasAggregates, hasGroupBy) {
+    if (projections.length > 0 && hasAggregates && !hasGroupBy) {
+        throw new QuereusError('Cannot mix aggregate and non-aggregate columns in SELECT list without GROUP BY', StatusCode.ERROR);
+    }
+}
+/**
+ * Creates a scope that includes the aggregate output columns
+ */
+function createAggregateOutputScope(parentScope, aggregateNode, groupByExpressions, aggregates) {
+    const aggregateOutputScope = new RegisteredScope(parentScope);
+    const aggregateAttributes = aggregateNode.getAttributes();
+    // Register GROUP BY columns
+    groupByExpressions.forEach((expr, index) => {
+        const attr = aggregateAttributes[index];
+        aggregateOutputScope.registerSymbol(attr.name.toLowerCase(), (exp, s) => new ColumnReferenceNode(s, exp, expr.getType(), attr.id, index));
+    });
+    // Register aggregate columns by their aliases
+    aggregates.forEach((agg, index) => {
+        const columnIndex = groupByExpressions.length + index;
+        const attr = aggregateAttributes[columnIndex];
+        aggregateOutputScope.registerSymbol(agg.alias.toLowerCase(), (exp, s) => new ColumnReferenceNode(s, exp, agg.expression.getType(), attr.id, columnIndex));
+    });
+    return aggregateOutputScope;
+}
+/**
+ * Builds HAVING filter clause
+ */
+function buildHavingFilter(input, havingClause, selectContext, aggregateOutputScope, aggregates, groupByExpressions) {
+    const aggregateAttributes = input.getAttributes();
+    // Build HAVING expression with the aggregate scope
+    const havingContext = {
+        ...selectContext,
+        scope: aggregateOutputScope,
+        aggregates: aggregates.map((agg, index) => {
+            const columnIndex = groupByExpressions.length + index;
+            const attr = aggregateAttributes[columnIndex];
+            return {
+                expression: agg.expression,
+                alias: agg.alias,
+                columnIndex,
+                attributeId: attr.id
+            };
+        })
+    };
+    const havingExpression = buildExpression(havingContext, havingClause, true);
+    return new FilterNode(aggregateOutputScope, input, havingExpression);
+}
+/**
+ * Checks if a final projection is needed for complex expressions
+ */
+function checkNeedsFinalProjection(projections) {
+    if (projections.length === 0) {
+        return false;
+    }
+    // Check if any of the projections are complex expressions (not just column refs)
+    return projections.some(proj => {
+        // If it's not a simple ColumnReferenceNode, we need final projection
+        return !(proj.node instanceof ColumnReferenceNode);
+    });
+}
+/**
+ * Builds final projections for the complete SELECT list in aggregate context
+ */
+export function buildFinalAggregateProjections(stmt, selectContext, aggregateOutputScope) {
+    const finalProjections = [];
+    for (const column of stmt.columns) {
+        if (column.type === 'column') {
+            // Re-build the expression in the context of the aggregate output
+            const finalContext = { ...selectContext, scope: aggregateOutputScope };
+            const scalarNode = buildExpression(finalContext, column.expr, true);
+            finalProjections.push({
+                node: scalarNode,
+                alias: column.alias || (column.expr.type === 'column' ? column.expr.name : undefined)
+            });
+        }
+    }
+    return finalProjections;
+}
+//# sourceMappingURL=select-aggregates.js.map

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

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

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

@@ -0,0 +1,9 @@
+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 { CTEPlanNode } from '../nodes/cte-node.js';
+/**
+ * Builds a compound SELECT statement (UNION, INTERSECT, EXCEPT)
+ */
+export declare function buildCompoundSelect(stmt: AST.SelectStmt, contextWithCTEs: PlanningContext, cteNodes: Map<string, CTEPlanNode>, buildSelectStmt: (ctx: PlanningContext, stmt: AST.SelectStmt, parentCTEs?: Map<string, CTEPlanNode>) => RelationalPlanNode): RelationalPlanNode;
+//# sourceMappingURL=select-compound.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"select-compound.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-compound.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,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAYxD;;GAEG;AACH,wBAAgB,mBAAmB,CAClC,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAClC,eAAe,EAAE,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,KAAK,kBAAkB,GACxH,kBAAkB,CA4BpB"}

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

@@ -0,0 +1,78 @@
+import { SetOperationNode } from '../nodes/set-operation-node.js';
+import { SortNode } from '../nodes/sort.js';
+import { LimitOffsetNode } from '../nodes/limit-offset.js';
+import { LiteralNode } from '../nodes/scalar.js';
+import { RegisteredScope } from '../scopes/registered.js';
+import { ColumnReferenceNode } from '../nodes/reference.js';
+import { buildExpression } from './expression.js';
+// Import will be added after refactoring select.ts
+import { QuereusError } from '../../common/errors.js';
+import { StatusCode } from '../../common/types.js';
+/**
+ * Builds a compound SELECT statement (UNION, INTERSECT, EXCEPT)
+ */
+export function buildCompoundSelect(stmt, contextWithCTEs, cteNodes, buildSelectStmt) {
+    if (!stmt.compound) {
+        throw new QuereusError('buildCompoundSelect called without compound clause', StatusCode.INTERNAL);
+    }
+    // Build left side by cloning the statement without compound and stripping ORDER BY/LIMIT/OFFSET that belong to outer query
+    const { compound: _outerCompound, orderBy: outerOrderBy, limit: outerLimit, offset: outerOffset, ...leftCore } = stmt;
+    // Also strip ORDER BY/LIMIT/OFFSET from the right side - they should only apply to the final compound result
+    const { orderBy: _rightOrderBy, limit: _rightLimit, offset: _rightOffset, ...rightCore } = stmt.compound.select;
+    const leftPlan = buildSelectStmt(contextWithCTEs, leftCore, cteNodes);
+    const rightPlan = buildSelectStmt(contextWithCTEs, rightCore, cteNodes);
+    const setNode = new SetOperationNode(contextWithCTEs.scope, leftPlan, rightPlan, stmt.compound.op);
+    // After set operation, apply ORDER BY / LIMIT / OFFSET from the *outer* (original) statement
+    let input = setNode;
+    // Build scope for output columns
+    const setScope = createSetOperationScope(input);
+    const selectContext = { ...contextWithCTEs, scope: setScope };
+    // Apply outer modifiers
+    input = applyOuterOrderBy(input, outerOrderBy, selectContext);
+    input = applyOuterLimitOffset(input, outerLimit, outerOffset, selectContext);
+    return input;
+}
+/**
+ * Creates a scope for set operation output columns
+ */
+function createSetOperationScope(setNode) {
+    const setScope = new RegisteredScope();
+    const attrs = setNode.getAttributes();
+    setNode.getType().columns.forEach((c, i) => {
+        const attr = attrs[i];
+        // Ensure column has a name - use attribute name as fallback
+        const columnName = c.name || attr.name;
+        if (!columnName) {
+            throw new QuereusError(`Column at index ${i} has no name in set operation`, StatusCode.ERROR);
+        }
+        setScope.registerSymbol(columnName.toLowerCase(), (exp, s) => new ColumnReferenceNode(s, exp, c.type, attr.id, i));
+    });
+    return setScope;
+}
+/**
+ * Applies ORDER BY clause from outer compound statement
+ */
+function applyOuterOrderBy(input, outerOrderBy, selectContext) {
+    if (outerOrderBy && outerOrderBy.length > 0) {
+        const sortKeys = outerOrderBy.map((ob) => ({
+            expression: buildExpression(selectContext, ob.expr),
+            direction: ob.direction,
+            nulls: ob.nulls,
+        }));
+        return new SortNode(selectContext.scope, input, sortKeys);
+    }
+    return input;
+}
+/**
+ * Applies LIMIT and OFFSET clauses from outer compound statement
+ */
+function applyOuterLimitOffset(input, outerLimit, outerOffset, selectContext) {
+    if (outerLimit || outerOffset) {
+        const literalNull = new LiteralNode(selectContext.scope, { type: 'literal', value: null });
+        const limitExpr = outerLimit ? buildExpression(selectContext, outerLimit) : literalNull;
+        const offsetExpr = outerOffset ? buildExpression(selectContext, outerOffset) : literalNull;
+        return new LimitOffsetNode(selectContext.scope, input, limitExpr, offsetExpr);
+    }
+    return input;
+}
+//# sourceMappingURL=select-compound.js.map

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

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

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

@@ -0,0 +1,18 @@
+import type * as AST from '../../parser/ast.js';
+import type { PlanningContext } from '../planning-context.js';
+import type { CTEPlanNode } from '../nodes/cte-node.js';
+import type { Scope } from '../scopes/scope.js';
+/**
+ * Helper function to get the non-parameter ancestor scope.
+ * This ensures table/column scopes don't inherit from ParameterScope,
+ * preventing parameter resolution ambiguity in MultiScope.
+ */
+export declare function getNonParamAncestor(scope: Scope): Scope;
+/**
+ * Builds context with CTEs if present
+ */
+export declare function buildWithContext(ctx: PlanningContext, stmt: AST.SelectStmt, parentCTEs?: Map<string, CTEPlanNode>): {
+    contextWithCTEs: PlanningContext;
+    cteNodes: Map<string, CTEPlanNode>;
+};
+//# sourceMappingURL=select-context.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"select-context.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAMhD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAEvD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC/B,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,GAAG,CAAC,UAAU,EACpB,UAAU,GAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAa,GAC9C;IACF,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CACnC,CAsBA"}

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

@@ -0,0 +1,54 @@
+import { RegisteredScope } from '../scopes/registered.js';
+import { ParameterScope } from '../scopes/param.js';
+import { ColumnReferenceNode } from '../nodes/reference.js';
+import { buildWithClause } from './with.js';
+/**
+ * Helper function to get the non-parameter ancestor scope.
+ * This ensures table/column scopes don't inherit from ParameterScope,
+ * preventing parameter resolution ambiguity in MultiScope.
+ */
+export function getNonParamAncestor(scope) {
+    return (scope instanceof ParameterScope) ? scope.parentScope : scope;
+}
+/**
+ * Builds context with CTEs if present
+ */
+export function buildWithContext(ctx, stmt, parentCTEs = new Map()) {
+    // Start with parent CTEs
+    const cteNodes = new Map(parentCTEs);
+    let contextWithCTEs = ctx;
+    if (stmt.withClause) {
+        const newCteNodes = buildWithClause(ctx, stmt.withClause);
+        // Merge parent CTEs with new ones (new ones take precedence)
+        for (const [name, node] of newCteNodes) {
+            cteNodes.set(name, node);
+        }
+        // Create a new scope that includes the CTEs
+        const cteScope = createCTEScope(cteNodes, ctx);
+        contextWithCTEs = { ...ctx, scope: cteScope };
+    }
+    else if (parentCTEs.size > 0) {
+        // No WITH clause but we have parent CTEs, create scope for them
+        const cteScope = createCTEScope(parentCTEs, ctx);
+        contextWithCTEs = { ...ctx, scope: cteScope };
+    }
+    return { contextWithCTEs, cteNodes };
+}
+/**
+ * Creates a scope that includes CTE references
+ */
+function createCTEScope(cteNodes, ctx) {
+    const cteScope = new RegisteredScope(getNonParamAncestor(ctx.scope));
+    // Register each CTE in the scope
+    for (const [cteName, cteNode] of cteNodes) {
+        const attributes = cteNode.getAttributes();
+        cteNode.getType().columns.forEach((col, i) => {
+            const attr = attributes[i];
+            // Register CTE columns with qualified names to avoid collisions
+            const qualifiedColumnName = `${cteName}.${col.name.toLowerCase()}`;
+            cteScope.registerSymbol(qualifiedColumnName, (exp, s) => new ColumnReferenceNode(s, exp, col.type, attr.id, i));
+        });
+    }
+    return cteScope;
+}
+//# sourceMappingURL=select-context.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"select-context.js","sourceRoot":"","sources":["../../../../src/planner/building/select-context.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAE5C;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAY;IAC/C,OAAO,CAAC,KAAK,YAAY,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC;AACtE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAC/B,GAAoB,EACpB,IAAoB,EACpB,aAAuC,IAAI,GAAG,EAAE;IAKhD,yBAAyB;IACzB,MAAM,QAAQ,GAA6B,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAC/D,IAAI,eAAe,GAAG,GAAG,CAAC;IAE1B,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACrB,MAAM,WAAW,GAAG,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1D,6DAA6D;QAC7D,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC;YACxC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,4CAA4C;QAC5C,MAAM,QAAQ,GAAG,cAAc,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC/C,eAAe,GAAG,EAAE,GAAG,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IAC/C,CAAC;SAAM,IAAI,UAAU,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAChC,gEAAgE;QAChE,MAAM,QAAQ,GAAG,cAAc,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QACjD,eAAe,GAAG,EAAE,GAAG,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IAC/C,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC;AACtC,CAAC;AAED;;GAEG;AACH,SAAS,cAAc,CACtB,QAAkC,EAClC,GAAoB;IAEpB,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IAErE,iCAAiC;IACjC,KAAK,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC;QAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3C,OAAO,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAQ,EAAE,CAAS,EAAE,EAAE;YACzD,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YAC3B,gEAAgE;YAChE,MAAM,mBAAmB,GAAG,GAAG,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACnE,QAAQ,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CACvD,IAAI,mBAAmB,CAAC,CAAC,EAAE,GAAqB,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,QAAQ,CAAC;AACjB,CAAC"}

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

@@ -0,0 +1,25 @@
+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';
+/**
+ * Builds final projections for non-aggregate cases
+ */
+export declare function buildFinalProjections(input: RelationalPlanNode, projections: Projection[], selectScope: any, stmt: AST.SelectStmt, selectContext: PlanningContext): {
+    output: RelationalPlanNode;
+    finalContext: PlanningContext;
+    preAggregateSort: boolean;
+};
+/**
+ * Applies DISTINCT modifier if present
+ */
+export declare function applyDistinct(input: RelationalPlanNode, stmt: AST.SelectStmt, selectScope: any): RelationalPlanNode;
+/**
+ * Applies ORDER BY clause if not already applied
+ */
+export declare function applyOrderBy(input: RelationalPlanNode, stmt: AST.SelectStmt, selectContext: PlanningContext, preAggregateSort: boolean): RelationalPlanNode;
+/**
+ * Applies LIMIT and OFFSET clauses
+ */
+export declare function applyLimitOffset(input: RelationalPlanNode, stmt: AST.SelectStmt, selectContext: PlanningContext): RelationalPlanNode;
+//# sourceMappingURL=select-modifiers.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,120 @@
+import { DistinctNode } from '../nodes/distinct-node.js';
+import { SortNode } from '../nodes/sort.js';
+import { LimitOffsetNode } from '../nodes/limit-offset.js';
+import { LiteralNode } from '../nodes/scalar.js';
+import { ProjectNode } from '../nodes/project-node.js';
+import { MultiScope } from '../scopes/multi.js';
+import { RegisteredScope } from '../scopes/registered.js';
+import { ColumnReferenceNode } from '../nodes/reference.js';
+import { buildExpression } from './expression.js';
+/**
+ * Builds final projections for non-aggregate cases
+ */
+export function buildFinalProjections(input, projections, selectScope, stmt, selectContext) {
+    if (projections.length === 0) {
+        return { output: input, finalContext: selectContext, preAggregateSort: false };
+    }
+    // Check if ORDER BY should be applied before projection
+    const needsPreProjectionSort = shouldApplyOrderByBeforeProjection(stmt, projections);
+    let preAggregateSort = false;
+    let currentInput = input;
+    // Apply ORDER BY before projection if needed
+    if (needsPreProjectionSort && stmt.orderBy && stmt.orderBy.length > 0) {
+        const sortKeys = stmt.orderBy.map(orderByClause => {
+            const expression = buildExpression(selectContext, orderByClause.expr);
+            return {
+                expression,
+                direction: orderByClause.direction,
+                nulls: orderByClause.nulls
+            };
+        });
+        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
+    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,
+        preAggregateSort
+    };
+}
+/**
+ * Applies DISTINCT modifier if present
+ */
+export function applyDistinct(input, stmt, selectScope) {
+    if (stmt.distinct) {
+        return new DistinctNode(selectScope, input);
+    }
+    return input;
+}
+/**
+ * Applies ORDER BY clause if not already applied
+ */
+export function applyOrderBy(input, stmt, selectContext, preAggregateSort) {
+    if (stmt.orderBy && stmt.orderBy.length > 0 && !preAggregateSort) {
+        const sortKeys = stmt.orderBy.map(orderByClause => {
+            const expression = buildExpression(selectContext, orderByClause.expr);
+            return {
+                expression,
+                direction: orderByClause.direction,
+                nulls: orderByClause.nulls
+            };
+        });
+        return new SortNode(selectContext.scope, input, sortKeys);
+    }
+    return input;
+}
+/**
+ * Applies LIMIT and OFFSET clauses
+ */
+export function applyLimitOffset(input, stmt, selectContext) {
+    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);
+    }
+    return input;
+}
+/**
+ * Determines if ORDER BY should be applied before projection
+ */
+function shouldApplyOrderByBeforeProjection(stmt, projections) {
+    if (!stmt.orderBy || stmt.orderBy.length === 0) {
+        return false;
+    }
+    // Check if any ORDER BY column is not in the projection aliases
+    for (const orderByClause of stmt.orderBy) {
+        if (orderByClause.expr.type === 'column') {
+            const orderColumn = orderByClause.expr.name.toLowerCase();
+            // Check if this column is in the projection aliases
+            const isInProjection = projections.some(proj => (proj.alias?.toLowerCase() === orderColumn) ||
+                (proj.node instanceof ColumnReferenceNode && proj.node.expression.name.toLowerCase() === orderColumn));
+            if (!isInProjection) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+/**
+ * Creates a scope for projection output columns
+ */
+function createProjectionOutputScope(projectionNode) {
+    const projectionOutputScope = new RegisteredScope();
+    const projectionAttributes = projectionNode.getAttributes();
+    projectionNode.getType().columns.forEach((col, index) => {
+        const attr = projectionAttributes[index];
+        projectionOutputScope.registerSymbol(col.name.toLowerCase(), (exp, s) => new ColumnReferenceNode(s, exp, col.type, attr.id, index));
+    });
+    return projectionOutputScope;
+}
+//# sourceMappingURL=select-modifiers.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,37 @@
+import type * as AST from '../../parser/ast.js';
+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';
+/**
+ * Checks if an expression contains aggregate functions
+ */
+export declare function isAggregateExpression(node: ScalarPlanNode): boolean;
+/**
+ * Checks if an expression contains window functions
+ */
+export declare function isWindowExpression(node: ScalarPlanNode): boolean;
+/**
+ * Builds projections for SELECT * or table.*
+ */
+export declare function buildStarProjections(column: {
+    type: 'all';
+    table?: string;
+}, input: any, selectScope: any): Projection[];
+/**
+ * Analyzes SELECT columns and categorizes them into different types
+ */
+export declare function analyzeSelectColumns(columns: AST.ResultColumn[], selectContext: PlanningContext): {
+    projections: Projection[];
+    aggregates: {
+        expression: ScalarPlanNode;
+        alias: string;
+    }[];
+    windowFunctions: {
+        func: WindowFunctionCallNode;
+        alias?: string;
+    }[];
+    hasAggregates: boolean;
+    hasWindowFunctions: boolean;
+};
+//# sourceMappingURL=select-projections.d.ts.map

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

@@ -0,0 +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"}