@quereus/quereus 2.7.0 → 2.9.0

package/dist/src/planner/nodes/asof-scan-node.d.ts

@@ -0,0 +1,137 @@
+import { PlanNodeType } from './plan-node-type.js';
+import { PlanNode, type RelationalPlanNode, type BinaryRelationalNode, type PhysicalProperties, type Attribute } from './plan-node.js';
+import type { RelationType } from '../../common/datatype.js';
+import type { Scope } from '../scopes/scope.js';
+/**
+ * Pair of attribute IDs identifying matching attributes on the left and right sides
+ * of an asof scan (either the asof match attribute or a partition equi-pair).
+ */
+export interface AsofAttrPair {
+    leftAttrId: number;
+    rightAttrId: number;
+}
+/**
+ * Physical plan node implementing a streaming asof scan.
+ *
+ * For each left row, emits a single right row matched against the left's match
+ * value, optionally bucketed by partition keys. Two directions are supported:
+ *
+ *   - `direction = 'desc'`: latest right ≤ left.match (or strict <).
+ *   - `direction = 'asc'`:  earliest right ≥ left.match (or strict >).
+ *
+ * Requires the right input to advertise `MonotonicOn(matchAttr)` (ascending)
+ * and `accessCapabilities.asofRight`.
+ *
+ * Output attributes: left attributes followed by the projected right output
+ * attributes (NULL-padded when `outer` and no match exists). The optional
+ * `rightOutputAttrs` parameter lets the rule preserve attribute IDs from the
+ * original logical JoinNode — without it, all of `right`'s attributes are
+ * emitted unchanged.
+ *
+ * Two emitter strategies (selected by `rule-asof-strategy-select`):
+ *
+ *   - `'hash'` (default): bucket the right by partition key (`Map<string, Row[]>`),
+ *     stream the left with per-bucket cursors. Memory O(R), latency = first
+ *     emit after R fully arrives.
+ *   - `'merge'`: co-stream both inputs in lockstep when both are pre-ordered
+ *     by `[partition cols..., matchAttr]`. Memory O(1) (one in-flight
+ *     partition), emits as left rows arrive.
+ *
+ * Cost: O(left.rows + right.rows) regardless of strategy — the difference is
+ * constant factors / memory.
+ */
+export declare class AsofScanNode extends PlanNode implements BinaryRelationalNode {
+    /** Left (driving) input. */
+    readonly left: RelationalPlanNode;
+    /** Right input. Must advertise MonotonicOn(matchAttr.right) and accessCapabilities.asofRight. */
+    readonly right: RelationalPlanNode;
+    /** Asof match attribute pair. */
+    readonly matchAttr: AsofAttrPair;
+    /** Equi-partition keys (zero or more). Empty array = single bucket. */
+    readonly partitionAttrs: readonly AsofAttrPair[];
+    /** Strict (open) vs non-strict (closed) on the asof comparison. */
+    readonly strict: boolean;
+    /**
+     * Direction of the asof match.
+     *   'desc' → largest right.match ≤ left.match (or < when strict)
+     *   'asc'  → smallest right.match ≥ left.match (or > when strict)
+     */
+    readonly direction: 'asc' | 'desc';
+    /** LEFT JOIN semantics: emit unmatched left rows with NULL right columns. */
+    readonly outer: boolean;
+    /**
+     * Column indices into `right`'s row to project for output. If undefined,
+     * all of `right`'s columns are emitted in order.
+     */
+    readonly rightOutputColumnIndices?: readonly number[] | undefined;
+    /**
+     * Attributes to expose for the right side of the output. When provided,
+     * these are used verbatim (preserving attribute IDs from the original
+     * logical JoinNode). Length must match `rightOutputColumnIndices` (or the
+     * full right attribute count when no projection is given).
+     */
+    readonly rightOutputAttrs?: readonly Attribute[] | undefined;
+    /**
+     * Emitter strategy. Default is `'hash'`; the strategy-select rule may
+     * upgrade to `'merge'` when both inputs are co-partition-ordered and the
+     * right's row count crosses the configured threshold.
+     */
+    readonly strategy: 'hash' | 'merge';
+    readonly nodeType = PlanNodeType.AsofScan;
+    private attributesCache;
+    constructor(scope: Scope, 
+    /** Left (driving) input. */
+    left: RelationalPlanNode, 
+    /** Right input. Must advertise MonotonicOn(matchAttr.right) and accessCapabilities.asofRight. */
+    right: RelationalPlanNode, 
+    /** Asof match attribute pair. */
+    matchAttr: AsofAttrPair, 
+    /** Equi-partition keys (zero or more). Empty array = single bucket. */
+    partitionAttrs: readonly AsofAttrPair[], 
+    /** Strict (open) vs non-strict (closed) on the asof comparison. */
+    strict: boolean, 
+    /**
+     * Direction of the asof match.
+     *   'desc' → largest right.match ≤ left.match (or < when strict)
+     *   'asc'  → smallest right.match ≥ left.match (or > when strict)
+     */
+    direction: 'asc' | 'desc', 
+    /** LEFT JOIN semantics: emit unmatched left rows with NULL right columns. */
+    outer: boolean, 
+    /**
+     * Column indices into `right`'s row to project for output. If undefined,
+     * all of `right`'s columns are emitted in order.
+     */
+    rightOutputColumnIndices?: readonly number[] | undefined, 
+    /**
+     * Attributes to expose for the right side of the output. When provided,
+     * these are used verbatim (preserving attribute IDs from the original
+     * logical JoinNode). Length must match `rightOutputColumnIndices` (or the
+     * full right attribute count when no projection is given).
+     */
+    rightOutputAttrs?: readonly Attribute[] | undefined, 
+    /**
+     * Emitter strategy. Default is `'hash'`; the strategy-select rule may
+     * upgrade to `'merge'` when both inputs are co-partition-ordered and the
+     * right's row count crosses the configured threshold.
+     */
+    strategy?: 'hash' | 'merge');
+    /** Indices into the right row to emit, in output order. */
+    getRightOutputColumnIndices(): readonly number[];
+    private buildAttributes;
+    getAttributes(): Attribute[];
+    getType(): RelationType;
+    computePhysical(childrenPhysical: PhysicalProperties[]): Partial<PhysicalProperties>;
+    get estimatedRows(): number | undefined;
+    getChildren(): readonly PlanNode[];
+    getRelations(): readonly [RelationalPlanNode, RelationalPlanNode];
+    withChildren(newChildren: readonly PlanNode[]): PlanNode;
+    /**
+     * Return this node with `strategy` set to the given value. Returns `this`
+     * when the strategy is unchanged.
+     */
+    withStrategy(strategy: 'hash' | 'merge'): AsofScanNode;
+    toString(): string;
+    getLogicalAttributes(): Record<string, unknown>;
+}
+//# sourceMappingURL=asof-scan-node.d.ts.map

package/dist/src/planner/nodes/asof-scan-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"asof-scan-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/asof-scan-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAE,KAAK,oBAAoB,EAAE,KAAK,kBAAkB,EAAE,KAAK,SAAS,EAA0C,MAAM,gBAAgB,CAAC;AAC/K,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAMhD;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAAa,YAAa,SAAQ,QAAS,YAAW,oBAAoB;IAMxE,4BAA4B;aACZ,IAAI,EAAE,kBAAkB;IACxC,iGAAiG;aACjF,KAAK,EAAE,kBAAkB;IACzC,iCAAiC;aACjB,SAAS,EAAE,YAAY;IACvC,uEAAuE;aACvD,cAAc,EAAE,SAAS,YAAY,EAAE;IACvD,mEAAmE;aACnD,MAAM,EAAE,OAAO;IAC/B;;;;OAIG;aACa,SAAS,EAAE,KAAK,GAAG,MAAM;IACzC,6EAA6E;aAC7D,KAAK,EAAE,OAAO;IAC9B;;;OAGG;aACa,wBAAwB,CAAC,EAAE,SAAS,MAAM,EAAE;IAC5D;;;;;OAKG;aACa,gBAAgB,CAAC,EAAE,SAAS,SAAS,EAAE;IACvD;;;;OAIG;aACa,QAAQ,EAAE,MAAM,GAAG,OAAO;IAxC3C,SAAkB,QAAQ,yBAAyB;IACnD,OAAO,CAAC,eAAe,CAAsB;gBAG5C,KAAK,EAAE,KAAK;IACZ,4BAA4B;IACZ,IAAI,EAAE,kBAAkB;IACxC,iGAAiG;IACjF,KAAK,EAAE,kBAAkB;IACzC,iCAAiC;IACjB,SAAS,EAAE,YAAY;IACvC,uEAAuE;IACvD,cAAc,EAAE,SAAS,YAAY,EAAE;IACvD,mEAAmE;IACnD,MAAM,EAAE,OAAO;IAC/B;;;;OAIG;IACa,SAAS,EAAE,KAAK,GAAG,MAAM;IACzC,6EAA6E;IAC7D,KAAK,EAAE,OAAO;IAC9B;;;OAGG;IACa,wBAAwB,CAAC,EAAE,SAAS,MAAM,EAAE,YAAA;IAC5D;;;;;OAKG;IACa,gBAAgB,CAAC,EAAE,SAAS,SAAS,EAAE,YAAA;IACvD;;;;OAIG;IACa,QAAQ,GAAE,MAAM,GAAG,OAAgB;IAWpD,2DAA2D;IAC3D,2BAA2B,IAAI,SAAS,MAAM,EAAE;IAKhD,OAAO,CAAC,eAAe;IAyBvB,aAAa,IAAI,SAAS,EAAE;IAI5B,OAAO,IAAI,YAAY;IAcvB,eAAe,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAmBpF,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAED,WAAW,IAAI,SAAS,QAAQ,EAAE;IAIlC,YAAY,IAAI,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAIjE,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;IAiCxD;;;OAGG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,YAAY;IAiB7C,QAAQ,IAAI,MAAM;IAalB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAaxD"}

package/dist/src/planner/nodes/asof-scan-node.js

@@ -0,0 +1,223 @@
+import { PlanNodeType } from './plan-node-type.js';
+import { PlanNode, isRelationalNode } from './plan-node.js';
+import { Cached } from '../../util/cached.js';
+import { StatusCode } from '../../common/types.js';
+import { quereusError } from '../../common/errors.js';
+import { buildJoinAttributes, buildJoinRelationType } from './join-utils.js';
+/**
+ * Physical plan node implementing a streaming asof scan.
+ *
+ * For each left row, emits a single right row matched against the left's match
+ * value, optionally bucketed by partition keys. Two directions are supported:
+ *
+ *   - `direction = 'desc'`: latest right ≤ left.match (or strict <).
+ *   - `direction = 'asc'`:  earliest right ≥ left.match (or strict >).
+ *
+ * Requires the right input to advertise `MonotonicOn(matchAttr)` (ascending)
+ * and `accessCapabilities.asofRight`.
+ *
+ * Output attributes: left attributes followed by the projected right output
+ * attributes (NULL-padded when `outer` and no match exists). The optional
+ * `rightOutputAttrs` parameter lets the rule preserve attribute IDs from the
+ * original logical JoinNode — without it, all of `right`'s attributes are
+ * emitted unchanged.
+ *
+ * Two emitter strategies (selected by `rule-asof-strategy-select`):
+ *
+ *   - `'hash'` (default): bucket the right by partition key (`Map<string, Row[]>`),
+ *     stream the left with per-bucket cursors. Memory O(R), latency = first
+ *     emit after R fully arrives.
+ *   - `'merge'`: co-stream both inputs in lockstep when both are pre-ordered
+ *     by `[partition cols..., matchAttr]`. Memory O(1) (one in-flight
+ *     partition), emits as left rows arrive.
+ *
+ * Cost: O(left.rows + right.rows) regardless of strategy — the difference is
+ * constant factors / memory.
+ */
+export class AsofScanNode extends PlanNode {
+    left;
+    right;
+    matchAttr;
+    partitionAttrs;
+    strict;
+    direction;
+    outer;
+    rightOutputColumnIndices;
+    rightOutputAttrs;
+    strategy;
+    nodeType = PlanNodeType.AsofScan;
+    attributesCache;
+    constructor(scope, 
+    /** Left (driving) input. */
+    left, 
+    /** Right input. Must advertise MonotonicOn(matchAttr.right) and accessCapabilities.asofRight. */
+    right, 
+    /** Asof match attribute pair. */
+    matchAttr, 
+    /** Equi-partition keys (zero or more). Empty array = single bucket. */
+    partitionAttrs, 
+    /** Strict (open) vs non-strict (closed) on the asof comparison. */
+    strict, 
+    /**
+     * Direction of the asof match.
+     *   'desc' → largest right.match ≤ left.match (or < when strict)
+     *   'asc'  → smallest right.match ≥ left.match (or > when strict)
+     */
+    direction, 
+    /** LEFT JOIN semantics: emit unmatched left rows with NULL right columns. */
+    outer, 
+    /**
+     * Column indices into `right`'s row to project for output. If undefined,
+     * all of `right`'s columns are emitted in order.
+     */
+    rightOutputColumnIndices, 
+    /**
+     * Attributes to expose for the right side of the output. When provided,
+     * these are used verbatim (preserving attribute IDs from the original
+     * logical JoinNode). Length must match `rightOutputColumnIndices` (or the
+     * full right attribute count when no projection is given).
+     */
+    rightOutputAttrs, 
+    /**
+     * Emitter strategy. Default is `'hash'`; the strategy-select rule may
+     * upgrade to `'merge'` when both inputs are co-partition-ordered and the
+     * right's row count crosses the configured threshold.
+     */
+    strategy = 'hash') {
+        const leftRows = left.estimatedRows ?? 100;
+        const rightRows = right.estimatedRows ?? 100;
+        // O(L + R) per-row work plus the children's own costs.
+        const cost = left.getTotalCost() + right.getTotalCost() + leftRows + rightRows;
+        super(scope, cost);
+        this.left = left;
+        this.right = right;
+        this.matchAttr = matchAttr;
+        this.partitionAttrs = partitionAttrs;
+        this.strict = strict;
+        this.direction = direction;
+        this.outer = outer;
+        this.rightOutputColumnIndices = rightOutputColumnIndices;
+        this.rightOutputAttrs = rightOutputAttrs;
+        this.strategy = strategy;
+        this.attributesCache = new Cached(() => this.buildAttributes());
+    }
+    /** Indices into the right row to emit, in output order. */
+    getRightOutputColumnIndices() {
+        if (this.rightOutputColumnIndices)
+            return this.rightOutputColumnIndices;
+        return this.right.getAttributes().map((_, i) => i);
+    }
+    buildAttributes() {
+        const leftAttrs = this.left.getAttributes();
+        const rightAttrs = this.right.getAttributes();
+        const rightCols = this.getRightOutputColumnIndices();
+        // When `rightOutputAttrs` is supplied, use those verbatim alongside the left
+        // attributes — they already encode the JoinNode's preserved IDs and any
+        // nullability overrides for `outer`.
+        if (this.rightOutputAttrs) {
+            if (this.rightOutputAttrs.length !== rightCols.length) {
+                quereusError(`AsofScanNode: rightOutputAttrs length ${this.rightOutputAttrs.length} != rightOutputColumnIndices length ${rightCols.length}`, StatusCode.INTERNAL);
+            }
+            return [...leftAttrs, ...this.rightOutputAttrs];
+        }
+        const projectedRightAttrs = rightCols.map(idx => {
+            if (idx < 0 || idx >= rightAttrs.length) {
+                quereusError(`AsofScanNode: rightOutputColumnIndex ${idx} out of range [0,${rightAttrs.length})`, StatusCode.INTERNAL);
+            }
+            return rightAttrs[idx];
+        });
+        return buildJoinAttributes(leftAttrs, projectedRightAttrs, this.outer ? 'left' : 'inner');
+    }
+    getAttributes() {
+        return this.attributesCache.value;
+    }
+    getType() {
+        const leftType = this.left.getType();
+        const rightAttrs = this.getAttributes().slice(this.left.getAttributes().length);
+        const rightType = {
+            typeClass: 'relation',
+            isReadOnly: true,
+            isSet: false,
+            columns: rightAttrs.map(a => ({ name: a.name, type: a.type })),
+            keys: [],
+            rowConstraints: [],
+        };
+        return buildJoinRelationType(leftType, rightType, this.outer ? 'left' : 'inner', []);
+    }
+    computePhysical(childrenPhysical) {
+        const leftPhys = childrenPhysical[0];
+        // AsofScan emits one row per left row in left's order — left's ordering and
+        // monotonicOn carry through (right values are appended per row but don't
+        // reorder the output).
+        const monotonicOn = leftPhys?.monotonicOn;
+        const ordering = leftPhys?.ordering;
+        return {
+            ordering,
+            monotonicOn,
+            estimatedRows: this.left.estimatedRows,
+            // Drop unique keys: appending right values per left row doesn't preserve
+            // uniqueness on left's keys (and the right side has no key contribution).
+            uniqueKeys: undefined,
+        };
+    }
+    get estimatedRows() {
+        return this.left.estimatedRows;
+    }
+    getChildren() {
+        return [this.left, this.right];
+    }
+    getRelations() {
+        return [this.left, this.right];
+    }
+    withChildren(newChildren) {
+        if (newChildren.length !== 2) {
+            quereusError(`AsofScanNode expects 2 children, got ${newChildren.length}`, StatusCode.INTERNAL);
+        }
+        const [newLeft, newRight] = newChildren;
+        if (!isRelationalNode(newLeft)) {
+            quereusError('AsofScanNode: first child must be a RelationalPlanNode', StatusCode.INTERNAL);
+        }
+        if (!isRelationalNode(newRight)) {
+            quereusError('AsofScanNode: second child must be a RelationalPlanNode', StatusCode.INTERNAL);
+        }
+        if (newLeft === this.left && newRight === this.right) {
+            return this;
+        }
+        return new AsofScanNode(this.scope, newLeft, newRight, this.matchAttr, this.partitionAttrs, this.strict, this.direction, this.outer, this.rightOutputColumnIndices, this.rightOutputAttrs, this.strategy);
+    }
+    /**
+     * Return this node with `strategy` set to the given value. Returns `this`
+     * when the strategy is unchanged.
+     */
+    withStrategy(strategy) {
+        if (strategy === this.strategy)
+            return this;
+        return new AsofScanNode(this.scope, this.left, this.right, this.matchAttr, this.partitionAttrs, this.strict, this.direction, this.outer, this.rightOutputColumnIndices, this.rightOutputAttrs, strategy);
+    }
+    toString() {
+        // 'desc' → right ≤/< left; 'asc' → right ≥/> left.
+        const op = this.direction === 'desc'
+            ? (this.strict ? '<' : '<=')
+            : (this.strict ? '>' : '>=');
+        const parts = [];
+        parts.push(`right.${this.matchAttr.rightAttrId} ${op} left.${this.matchAttr.leftAttrId}`);
+        for (const p of this.partitionAttrs) {
+            parts.push(`right.${p.rightAttrId} = left.${p.leftAttrId}`);
+        }
+        return `${this.outer ? 'LEFT ' : ''}ASOF SCAN [${this.strategy}] on [${parts.join(', ')}]`;
+    }
+    getLogicalAttributes() {
+        return {
+            outer: this.outer,
+            strict: this.strict,
+            direction: this.direction,
+            strategy: this.strategy,
+            matchAttr: { left: this.matchAttr.leftAttrId, right: this.matchAttr.rightAttrId },
+            partitionAttrs: this.partitionAttrs.map(p => ({ left: p.leftAttrId, right: p.rightAttrId })),
+            rightOutputColumnIndices: this.rightOutputColumnIndices ? [...this.rightOutputColumnIndices] : undefined,
+            leftRows: this.left.estimatedRows,
+            rightRows: this.right.estimatedRows,
+        };
+    }
+}
+//# sourceMappingURL=asof-scan-node.js.map

package/dist/src/planner/nodes/asof-scan-node.js.map

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

package/dist/src/planner/nodes/constraint-check-node.d.ts

@@ -5,12 +5,32 @@ import type { TableReferenceNode } from './reference.js';
 import type { RelationType } from '../../common/datatype.js';
 import type { RowOpFlag } from '../../schema/table.js';
 import type { RowConstraintSchema } from '../../schema/table.js';
+import type { ConflictResolution } from '../../common/constants.js';
+import type { Expression } from '../../parser/ast.js';
 export interface ConstraintCheck {
     constraint: RowConstraintSchema;
     expression: ScalarPlanNode;
     deferrable?: boolean;
     initiallyDeferred?: boolean;
     needsDeferred: boolean;
+    /** Constraint class for conflict-resolution dispatch at runtime. */
+    kind?: 'check' | 'fk-child' | 'fk-parent';
+    /** For 'fk-parent' UPDATE checks: parent-table column indices the FK references.
+     *  When set, the runtime can skip the check when none of these indices changed. */
+    referencedColumnIndices?: ReadonlyArray<number>;
+}
+/**
+ * Pre-built default-value evaluator for a NOT NULL column with a DEFAULT clause.
+ * Used by REPLACE-on-NOT-NULL substitution to fill the NEW slot when the user
+ * supplied NULL for a NOT NULL column.
+ */
+export interface NotNullDefaultPlan {
+    /** Index of the column in the table schema. */
+    columnIndex: number;
+    /** AST default expression (used as a fallback if the planned node is missing). */
+    defaultExpr: Expression;
+    /** Pre-built scalar node that evaluates the default in the current row context. */
+    defaultNode: ScalarPlanNode;
 }
 /**
  * Represents constraint checking for DML operations.
@@ -27,10 +47,14 @@ export declare class ConstraintCheckNode extends PlanNode implements RelationalP
     readonly mutationContextValues?: Map<string, ScalarPlanNode> | undefined;
     readonly contextAttributes?: Attribute[] | undefined;
     readonly contextDescriptor?: RowDescriptor | undefined;
+    readonly onConflict?: ConflictResolution | undefined;
+    readonly notNullDefaults?: ReadonlyArray<NotNullDefaultPlan> | undefined;
     readonly nodeType = PlanNodeType.ConstraintCheck;
     constructor(scope: Scope, source: RelationalPlanNode, table: TableReferenceNode, operation: RowOpFlag, oldRowDescriptor: RowDescriptor | undefined, newRowDescriptor: RowDescriptor | undefined, flatRowDescriptor: RowDescriptor, constraintChecks: ConstraintCheck[], mutationContextValues?: Map<string, ScalarPlanNode> | undefined, // Mutation context value expressions
     contextAttributes?: Attribute[] | undefined, // Mutation context attributes
-    contextDescriptor?: RowDescriptor | undefined);
+    contextDescriptor?: RowDescriptor | undefined, // Mutation context row descriptor
+    onConflict?: ConflictResolution | undefined, // Statement-level OR clause; resolves IGNORE/REPLACE/FAIL/ROLLBACK
+    notNullDefaults?: ReadonlyArray<NotNullDefaultPlan> | undefined);
     getType(): RelationType;
     getAttributes(): readonly Attribute[];
     getRelations(): readonly [RelationalPlanNode, TableReferenceNode];

package/dist/src/planner/nodes/constraint-check-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constraint-check-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/constraint-check-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAE,KAAK,SAAS,EAAE,KAAK,aAAa,EAAE,KAAK,cAAc,EAAkC,MAAM,gBAAgB,CAAC;AAC5J,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,mBAAmB,CAAC;IAChC,UAAU,EAAE,cAAc,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,EAAE,OAAO,CAAC;CACxB;AAED;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,QAAS,YAAW,kBAAkB;aAK3D,MAAM,EAAE,kBAAkB;aAC1B,KAAK,EAAE,kBAAkB;aACzB,SAAS,EAAE,SAAS;aACpB,gBAAgB,EAAE,aAAa,GAAG,SAAS;aAC3C,gBAAgB,EAAE,aAAa,GAAG,SAAS;aAC3C,iBAAiB,EAAE,aAAa;aAChC,gBAAgB,EAAE,eAAe,EAAE;aACnC,qBAAqB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;aACnD,iBAAiB,CAAC,EAAE,SAAS,EAAE;aAC/B,iBAAiB,CAAC,EAAE,aAAa;IAbnD,SAAkB,QAAQ,gCAAgC;gBAGxD,KAAK,EAAE,KAAK,EACI,MAAM,EAAE,kBAAkB,EAC1B,KAAK,EAAE,kBAAkB,EACzB,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,aAAa,GAAG,SAAS,EAC3C,gBAAgB,EAAE,aAAa,GAAG,SAAS,EAC3C,iBAAiB,EAAE,aAAa,EAChC,gBAAgB,EAAE,eAAe,EAAE,EACnC,qBAAqB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,YAAA,EAAE,qCAAqC;IAC1F,iBAAiB,CAAC,EAAE,SAAS,EAAE,YAAA,EAAE,8BAA8B;IAC/D,iBAAiB,CAAC,EAAE,aAAa,YAAA;IAKnD,OAAO,IAAI,YAAY;IAIvB,aAAa,IAAI,SAAS,SAAS,EAAE;IAKrC,YAAY,IAAI,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAIjE,WAAW,IAAI,SAAS,QAAQ,EAAE;IASlC,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;IAiDxD,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAEQ,QAAQ,IAAI,MAAM;IAQlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAezD"}
+{"version":3,"file":"constraint-check-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/constraint-check-node.ts"],"names":[],"mappings":"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"}

package/dist/src/planner/nodes/constraint-check-node.js

@@ -15,10 +15,14 @@ export class ConstraintCheckNode extends PlanNode {
     mutationContextValues;
     contextAttributes;
     contextDescriptor;
+    onConflict;
+    notNullDefaults;
     nodeType = PlanNodeType.ConstraintCheck;
     constructor(scope, source, table, operation, oldRowDescriptor, newRowDescriptor, flatRowDescriptor, constraintChecks, mutationContextValues, // Mutation context value expressions
     contextAttributes, // Mutation context attributes
-    contextDescriptor) {
+    contextDescriptor, // Mutation context row descriptor
+    onConflict, // Statement-level OR clause; resolves IGNORE/REPLACE/FAIL/ROLLBACK
+    notNullDefaults) {
         super(scope);
         this.source = source;
         this.table = table;
@@ -30,6 +34,8 @@ export class ConstraintCheckNode extends PlanNode {
         this.mutationContextValues = mutationContextValues;
         this.contextAttributes = contextAttributes;
         this.contextDescriptor = contextDescriptor;
+        this.onConflict = onConflict;
+        this.notNullDefaults = notNullDefaults;
     }
     getType() {
         return this.source.getType();
@@ -47,14 +53,22 @@ export class ConstraintCheckNode extends PlanNode {
         this.constraintChecks.forEach(check => {
             children.push(check.expression);
         });
+        // Add NOT NULL DEFAULT evaluators so they participate in optimization too.
+        if (this.notNullDefaults) {
+            this.notNullDefaults.forEach(d => children.push(d.defaultNode));
+        }
         return children;
     }
     withChildren(newChildren) {
-        const expectedChildren = 1 + this.constraintChecks.length;
+        const constraintCount = this.constraintChecks.length;
+        const defaultCount = this.notNullDefaults?.length ?? 0;
+        const expectedChildren = 1 + constraintCount + defaultCount;
         if (newChildren.length !== expectedChildren) {
             throw new Error(`ConstraintCheckNode expects ${expectedChildren} children, got ${newChildren.length}`);
         }
-        const [newSource, ...newConstraintExprs] = newChildren;
+        const newSource = newChildren[0];
+        const newConstraintExprs = newChildren.slice(1, 1 + constraintCount);
+        const newDefaultExprs = newChildren.slice(1 + constraintCount);
         // Type check the source
         if (!isRelationalNode(newSource)) {
             throw new Error('ConstraintCheckNode: first child must be a RelationalPlanNode');
@@ -66,9 +80,17 @@ export class ConstraintCheckNode extends PlanNode {
                 throw new Error(`ConstraintCheckNode: constraint child ${i + 1} must be a ScalarPlanNode`);
             }
         }
+        for (let i = 0; i < newDefaultExprs.length; i++) {
+            const expr = newDefaultExprs[i];
+            if (!isScalarNode(expr)) {
+                throw new Error(`ConstraintCheckNode: default child ${i + 1} must be a ScalarPlanNode`);
+            }
+        }
         // Return same instance if nothing changed
-        if (newSource === this.source &&
-            newConstraintExprs.every((expr, i) => expr === this.constraintChecks[i].expression)) {
+        const constraintsUnchanged = newConstraintExprs.every((expr, i) => expr === this.constraintChecks[i].expression);
+        const defaultsUnchanged = !this.notNullDefaults
+            || newDefaultExprs.every((expr, i) => expr === this.notNullDefaults[i].defaultNode);
+        if (newSource === this.source && constraintsUnchanged && defaultsUnchanged) {
             return this;
         }
         // Rebuild constraint checks with new expressions
@@ -76,8 +98,14 @@ export class ConstraintCheckNode extends PlanNode {
             ...check,
             expression: newConstraintExprs[i]
         }));
+        const newNotNullDefaults = this.notNullDefaults
+            ? this.notNullDefaults.map((d, i) => ({
+                ...d,
+                defaultNode: newDefaultExprs[i],
+            }))
+            : undefined;
         // Create new instance
-        return new ConstraintCheckNode(this.scope, newSource, this.table, this.operation, this.oldRowDescriptor, this.newRowDescriptor, this.flatRowDescriptor, newConstraintChecks, this.mutationContextValues, this.contextAttributes, this.contextDescriptor);
+        return new ConstraintCheckNode(this.scope, newSource, this.table, this.operation, this.oldRowDescriptor, this.newRowDescriptor, this.flatRowDescriptor, newConstraintChecks, this.mutationContextValues, this.contextAttributes, this.contextDescriptor, this.onConflict, newNotNullDefaults);
     }
     get estimatedRows() {
         return this.source.estimatedRows;
@@ -101,6 +129,8 @@ export class ConstraintCheckNode extends PlanNode {
             constraintNames: this.constraintChecks.map(c => c.constraint.name || '_unnamed'),
             hasOldDescriptor: !!this.oldRowDescriptor,
             hasNewDescriptor: !!this.newRowDescriptor,
+            onConflict: this.onConflict,
+            notNullDefaults: this.notNullDefaults?.length ?? 0,
         };
     }
 }

package/dist/src/planner/nodes/constraint-check-node.js.map

@@ -1 +1 @@
-{"version":3,"file":"constraint-check-node.js","sourceRoot":"","sources":["../../../../src/planner/nodes/constraint-check-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAoF,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC5J,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAcnD;;;GAGG;AACH,MAAM,OAAO,mBAAoB,SAAQ,QAAQ;IAK7B;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IACA;IAbA,QAAQ,GAAG,YAAY,CAAC,eAAe,CAAC;IAE1D,YACE,KAAY,EACI,MAA0B,EAC1B,KAAyB,EACzB,SAAoB,EACpB,gBAA2C,EAC3C,gBAA2C,EAC3C,iBAAgC,EAChC,gBAAmC,EACnC,qBAAmD,EAAE,qCAAqC;IAC1F,iBAA+B,EAAE,8BAA8B;IAC/D,iBAAiC;QAEjD,KAAK,CAAC,KAAK,CAAC,CAAC;QAXG,WAAM,GAAN,MAAM,CAAoB;QAC1B,UAAK,GAAL,KAAK,CAAoB;QACzB,cAAS,GAAT,SAAS,CAAW;QACpB,qBAAgB,GAAhB,gBAAgB,CAA2B;QAC3C,qBAAgB,GAAhB,gBAAgB,CAA2B;QAC3C,sBAAiB,GAAjB,iBAAiB,CAAe;QAChC,qBAAgB,GAAhB,gBAAgB,CAAmB;QACnC,0BAAqB,GAArB,qBAAqB,CAA8B;QACnD,sBAAiB,GAAjB,iBAAiB,CAAc;QAC/B,sBAAiB,GAAjB,iBAAiB,CAAgB;IAGnD,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IAED,aAAa;QACX,mEAAmE;QACnE,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;IACrC,CAAC;IAED,YAAY;QACV,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,WAAW;QACT,MAAM,QAAQ,GAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,4EAA4E;QAC5E,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACpC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,YAAY,CAAC,WAAgC;QAC3C,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;QAC1D,IAAI,WAAW,CAAC,MAAM,KAAK,gBAAgB,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,+BAA+B,gBAAgB,kBAAkB,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QACzG,CAAC;QAED,MAAM,CAAC,SAAS,EAAE,GAAG,kBAAkB,CAAC,GAAG,WAAW,CAAC;QAEvD,wBAAwB;QACxB,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;QACnF,CAAC;QAED,oCAAoC;QACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACnD,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YACnC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YAC7F,CAAC;QACH,CAAC;QAED,0CAA0C;QAC1C,IAAI,SAAS,KAAK,IAAI,CAAC,MAAM;YACzB,kBAAkB,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;YACxF,OAAO,IAAI,CAAC;QACd,CAAC;QAED,iDAAiD;QACjD,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACnE,GAAG,KAAK;YACR,UAAU,EAAE,kBAAkB,CAAC,CAAC,CAAmB;SACpD,CAAC,CAAC,CAAC;QAEJ,sBAAsB;QACtB,OAAO,IAAI,mBAAmB,CAC5B,IAAI,CAAC,KAAK,EACV,SAA+B,EAC/B,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,iBAAiB,EACtB,mBAAmB,EACnB,IAAI,CAAC,qBAAqB,EAC1B,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,iBAAiB,CACvB,CAAC;IACJ,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;IACnC,CAAC;IAEQ,QAAQ;QACf,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACjC,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACjC,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3D,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;QACrD,OAAO,SAAS,eAAe,mBAAmB,MAAM,EAAE,CAAC;IAC7D,CAAC;IAEQ,oBAAoB;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YACjC,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACjC,IAAI,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;QAE3D,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI;YAClC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU;YACzC,SAAS,EAAE,MAAM;YACjB,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM;YAC7C,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC;YAChF,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB;YACzC,gBAAgB,EAAE,CAAC,CAAC,IAAI,CAAC,gBAAgB;SAC1C,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"constraint-check-node.js","sourceRoot":"","sources":["../../../../src/planner/nodes/constraint-check-node.ts"],"names":[],"mappings":"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"}

package/dist/src/planner/nodes/distinct-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"distinct-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/distinct-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAE,KAAK,mBAAmB,EAAE,KAAK,SAAS,EAAoB,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACxJ,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAIhD;;;GAGG;AACH,qBAAa,YAAa,SAAQ,QAAS,YAAW,mBAAmB;aAKrD,MAAM,EAAE,kBAAkB;IAJ5C,SAAkB,QAAQ,yBAAyB;gBAGjD,KAAK,EAAE,KAAK,EACI,MAAM,EAAE,kBAAkB,EAC1C,qBAAqB,CAAC,EAAE,MAAM;IAShC,OAAO,IAAI,YAAY;IASvB,aAAa,IAAI,SAAS,SAAS,EAAE;IAKrC,WAAW,IAAI,SAAS,CAAC,kBAAkB,CAAC;IAI5C,YAAY,IAAI,SAAS,CAAC,kBAAkB,CAAC;IAI7C,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAUtC;IAEQ,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAQxD,eAAe,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAWpF,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;CAuBzD"}
+{"version":3,"file":"distinct-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/distinct-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAE,KAAK,mBAAmB,EAAE,KAAK,SAAS,EAAoB,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACxJ,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAIhD;;;GAGG;AACH,qBAAa,YAAa,SAAQ,QAAS,YAAW,mBAAmB;aAKrD,MAAM,EAAE,kBAAkB;IAJ5C,SAAkB,QAAQ,yBAAyB;gBAGjD,KAAK,EAAE,KAAK,EACI,MAAM,EAAE,kBAAkB,EAC1C,qBAAqB,CAAC,EAAE,MAAM;IAShC,OAAO,IAAI,YAAY;IASvB,aAAa,IAAI,SAAS,SAAS,EAAE;IAKrC,WAAW,IAAI,SAAS,CAAC,kBAAkB,CAAC;IAI5C,YAAY,IAAI,SAAS,CAAC,kBAAkB,CAAC;IAI7C,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAUtC;IAEQ,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAQxD,eAAe,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAoBpF,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;CAuBzD"}

package/dist/src/planner/nodes/distinct-node.js

@@ -61,10 +61,17 @@ export class DistinctNode extends PlanNode {
         const sourcePhysical = childrenPhysical[0];
         const colCount = this.source.getAttributes().length;
         const allColsKey = [Array.from({ length: colCount }, (_, i) => i)];
+        // Distinct strengthens an already-monotonic input from non-strict to strict.
+        // It does not establish ordering on its own.
+        const sourceMonotonic = sourcePhysical?.monotonicOn;
+        const monotonicOn = sourceMonotonic && sourceMonotonic.length > 0
+            ? sourceMonotonic.map(m => ({ ...m, strict: true }))
+            : undefined;
         return {
             uniqueKeys: allColsKey,
             estimatedRows: this.estimatedRows,
             ordering: sourcePhysical?.ordering,
+            monotonicOn,
         };
     }
     withChildren(newChildren) {

package/dist/src/planner/nodes/distinct-node.js.map

@@ -1 +1 @@
-{"version":3,"file":"distinct-node.js","sourceRoot":"","sources":["../../../../src/planner/nodes/distinct-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAqE,gBAAgB,EAA2B,MAAM,gBAAgB,CAAC;AAGxJ,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD;;;GAGG;AACH,MAAM,OAAO,YAAa,SAAQ,QAAQ;IAKtB;IAJA,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC;IAEnD,YACE,KAAY,EACI,MAA0B,EAC1C,qBAA8B;QAE9B,yFAAyF;QACzF,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;QACzC,MAAM,UAAU,GAAG,MAAM,CAAC,aAAa,IAAI,CAAC,CAAC;QAC7C,MAAM,iBAAiB,GAAG,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QAC1E,KAAK,CAAC,KAAK,EAAE,qBAAqB,IAAI,CAAC,UAAU,GAAG,iBAAiB,CAAC,CAAC,CAAC;QAPxD,WAAM,GAAN,MAAM,CAAoB;IAQ5C,CAAC;IAED,OAAO;QACL,iDAAiD;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACzC,OAAO;YACL,GAAG,UAAU;YACb,KAAK,EAAE,IAAI;SACZ,CAAC;IACJ,CAAC;IAED,aAAa;QACX,uDAAuD;QACvD,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;IACrC,CAAC;IAED,WAAW;QACT,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IAED,YAAY;QACV,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,aAAa;QACf,gEAAgE;QAChE,wEAAwE;QACxE,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;QAC7C,IAAI,UAAU,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC/C,IAAI,UAAU,IAAI,CAAC;YAAE,OAAO,UAAU,CAAC;QAEvC,gDAAgD;QAChD,0DAA0D;QAC1D,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC;IACnD,CAAC;IAEQ,QAAQ;QACf,OAAO,UAAU,CAAC;IACpB,CAAC;IAEQ,oBAAoB;QAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC;QACpD,MAAM,UAAU,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,OAAO;YACL,UAAU,EAAE,UAAU;SACvB,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,gBAAsC;QACpD,MAAM,cAAc,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC;QACpD,MAAM,UAAU,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,OAAO;YACL,UAAU,EAAE,UAAU;YACtB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,QAAQ,EAAE,cAAc,EAAE,QAAQ;SACnC,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,WAAgC;QAC3C,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,YAAY,CAAC,qCAAqC,WAAW,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC;QAEhC,aAAa;QACb,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC;YACjC,YAAY,CAAC,kDAAkD,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QACxF,CAAC;QAED,0CAA0C;QAC1C,IAAI,SAAS,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,mFAAmF;QACnF,OAAO,IAAI,YAAY,CACrB,IAAI,CAAC,KAAK,EACV,SAA+B,CAChC,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"distinct-node.js","sourceRoot":"","sources":["../../../../src/planner/nodes/distinct-node.ts"],"names":[],"mappings":"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"}

package/dist/src/planner/nodes/filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAE,KAAK,cAAc,EAAE,KAAK,mBAAmB,EAAE,KAAK,SAAS,EAAkC,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC3L,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAIhD,OAAO,EAAE,gBAAgB,EAAE,KAAK,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGhG;;;;GAIG;AACH,qBAAa,UAAW,SAAQ,QAAS,YAAW,mBAAmB,EAAE,gBAAgB,EAAE,sBAAsB;aAK/F,MAAM,EAAE,kBAAkB;aAC1B,SAAS,EAAE,cAAc;IAL1C,SAAkB,QAAQ,uBAAuB;gBAGhD,KAAK,EAAE,KAAK,EACI,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,cAAc,EACzC,qBAAqB,CAAC,EAAE,MAAM;IAM/B,OAAO,IAAI,YAAY;IAKvB,aAAa,IAAI,SAAS,SAAS,EAAE;IAKrC,WAAW,IAAI,SAAS,CAAC,kBAAkB,EAAE,cAAc,CAAC;IAI5D,YAAY,IAAI,SAAS,CAAC,kBAAkB,CAAC;IAI7C,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAOtC;IAED,eAAe,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA4B3E,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAMxD,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;IA6BxD,YAAY,IAAI,cAAc,GAAG,IAAI;IAIrC,aAAa,CAAC,YAAY,EAAE,cAAc,GAAG,IAAI,GAAG,QAAQ;IAc5D,aAAa,IAAI,SAAS,cAAc,EAAE;CAG1C"}
+{"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/filter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAE,KAAK,cAAc,EAAE,KAAK,mBAAmB,EAAE,KAAK,SAAS,EAAkC,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC3L,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAIhD,OAAO,EAAE,gBAAgB,EAAE,KAAK,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAIhG;;;;GAIG;AACH,qBAAa,UAAW,SAAQ,QAAS,YAAW,mBAAmB,EAAE,gBAAgB,EAAE,sBAAsB;aAK/F,MAAM,EAAE,kBAAkB;aAC1B,SAAS,EAAE,cAAc;IAL1C,SAAkB,QAAQ,uBAAuB;gBAGhD,KAAK,EAAE,KAAK,EACI,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,cAAc,EACzC,qBAAqB,CAAC,EAAE,MAAM;IAM/B,OAAO,IAAI,YAAY;IAKvB,aAAa,IAAI,SAAS,SAAS,EAAE;IAKrC,WAAW,IAAI,SAAS,CAAC,kBAAkB,EAAE,cAAc,CAAC;IAI5D,YAAY,IAAI,SAAS,CAAC,kBAAkB,CAAC;IAI7C,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAOtC;IAED,eAAe,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA8B3E,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAMxD,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;IA6BxD,YAAY,IAAI,cAAc,GAAG,IAAI;IAIrC,aAAa,CAAC,YAAY,EAAE,cAAc,GAAG,IAAI,GAAG,QAAQ;IAiB5D,aAAa,IAAI,SAAS,cAAc,EAAE;CAG1C"}

package/dist/src/planner/nodes/filter.js

@@ -4,6 +4,7 @@ import { formatExpression } from '../../util/plan-formatter.js';
 import { quereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
 import { createTableInfoFromNode, extractConstraints } from '../analysis/constraint-extractor.js';
+import { normalizePredicate } from '../analysis/predicate-normalizer.js';
 /**
  * Represents a filter operation (WHERE clause).
  * It takes an input relation and a predicate expression,
@@ -65,6 +66,8 @@ export class FilterNode extends PlanNode {
             estimatedRows: rows,
             ordering: sourcePhysical?.ordering,
             uniqueKeys,
+            // Filter preserves monotonicOn — a predicate doesn't reorder rows.
+            monotonicOn: sourcePhysical?.monotonicOn,
         };
     }
     toString() {
@@ -108,9 +111,12 @@ export class FilterNode extends PlanNode {
         }
         return new FilterNode(this.scope, this.source, newPredicate);
     }
-    // PredicateSourceCapable interface implementation
+    // PredicateSourceCapable interface implementation:
+    // expose a normalized form so plan-walk callers (constraint extractor, etc.)
+    // see canonical predicates regardless of NOT-wrapping in the source AST.
+    // Mirrors JoinNode.getPredicates().
     getPredicates() {
-        return [this.predicate];
+        return [normalizePredicate(this.predicate)];
     }
 }
 //# sourceMappingURL=filter.js.map