@quereus/quereus 4.5.0 → 4.7.0

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

@@ -14,17 +14,26 @@ export class CTENode extends PlanNode {
     materialize;
     nodeType = PlanNodeType.CTE;
     isCTECapable = true;
-    tableDescriptor = {}; // Identity object for table context lookup
+    /**
+     * Stable identity object for this CTE, minted once when the CTE is built and
+     * threaded through every optimizer rebuild. Two `CTENode` instances that
+     * describe the SAME source CTE share one descriptor, which is what lets
+     * emitCTE's per-execution buffer be shared across them (plan ids are not:
+     * a node reachable from two parents can be rebuilt once per parent path).
+     * Mirrors `RecursiveCTENode.tableDescriptor`.
+     */
+    tableDescriptor;
     attributesCache;
     typeCache;
     constructor(scope, cteName, columns, source, materializationHint, isRecursive = false, 
     /**
-     * Resolved materialization decision for emission, set by the
-     * materialization-advisory pass: when true, emitCTE buffers this CTE's
-     * rows once per statement execution and every reference reads that one
-     * shared buffer (multi-referenced or MATERIALIZED-hinted CTEs).
+     * Resolved materialization decision for emission: when true, emitCTE buffers
+     * this CTE's rows once per statement execution and every reference reads that
+     * one shared buffer. Set at build time for a data-modifying body (whose write
+     * must run exactly once), and by the materialization-advisory pass for a
+     * multi-referenced or MATERIALIZED-hinted read-only body.
      */
-    materialize = false) {
+    materialize = false, tableDescriptor) {
         // Self-cost only: the source flows in via getChildren(). Self is the CTE
         // materialization overhead.
         super(scope, 10);
@@ -34,6 +43,7 @@ export class CTENode extends PlanNode {
         this.materializationHint = materializationHint;
         this.isRecursive = isRecursive;
         this.materialize = materialize;
+        this.tableDescriptor = tableDescriptor ?? {}; // Identity object for table context lookup
         this.attributesCache = new Cached(() => this.buildAttributes());
         this.typeCache = new Cached(() => this.buildType());
     }
@@ -86,8 +96,10 @@ export class CTENode extends PlanNode {
         if (newSource === this.source) {
             return this;
         }
-        // Create new instance with updated source
-        return new CTENode(this.scope, this.cteName, this.columns, newSource, this.materializationHint, this.isRecursive, this.materialize);
+        // Create new instance with updated source. `tableDescriptor` is threaded
+        // through so a rebuilt copy still shares the original's identity — see the
+        // field's doc comment.
+        return new CTENode(this.scope, this.cteName, this.columns, newSource, this.materializationHint, this.isRecursive, this.materialize, this.tableDescriptor);
     }
     getCTESource() {
         return this.source;
@@ -96,7 +108,11 @@ export class CTENode extends PlanNode {
         const recursiveText = this.isRecursive ? 'RECURSIVE ' : '';
         const columnsText = this.columns ? `(${this.columns.join(', ')})` : '';
         const materializationText = this.materializationHint ? ` ${this.materializationHint.toUpperCase()}` : '';
-        return `${recursiveText}CTE ${this.cteName}${columnsText}${materializationText}`;
+        // The resolved decision, which is NOT the hint: a data-modifying body is
+        // always buffered and a multi-referenced one usually is, hint or none.
+        // Matches RecursiveCTENode.toString().
+        const bufferedText = this.materialize ? ' [buffered]' : '';
+        return `${recursiveText}CTE ${this.cteName}${columnsText}${materializationText}${bufferedText}`;
     }
     getLogicalAttributes() {
         return {

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

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

package/dist/src/planner/nodes/delete-node.d.ts

@@ -11,14 +11,32 @@ export declare class DeleteNode extends PlanNode implements RelationalPlanNode {
     readonly source: RelationalPlanNode;
     readonly oldRowDescriptor?: RowDescriptor | undefined;
     readonly flatRowDescriptor?: RowDescriptor | undefined;
+    /**
+     * Mutation context value expressions.
+     *
+     * NOTE: deliberately NOT exposed via `getChildren` (OPT-009): no emitter or rule reads
+     * this map from this node — only `DmlExecutorNode` / `ConstraintCheckNode` consume it,
+     * and they expose their copies. It is therefore a pass-through reference that goes
+     * stale (holds pre-rewrite subtrees) once the optimizer rebuilds those nodes. If
+     * anything ever starts reading it here, expose it as a child first.
+     */
     readonly mutationContextValues?: Map<string, ScalarPlanNode> | undefined;
     readonly contextAttributes?: Attribute[] | undefined;
     readonly contextDescriptor?: RowDescriptor | undefined;
     readonly nodeType = PlanNodeType.Delete;
     constructor(scope: Scope, table: TableReferenceNode, source: RelationalPlanNode, // Typically a FilterNode wrapping a TableReferenceNode
     oldRowDescriptor?: RowDescriptor | undefined, // For constraint checking
-    flatRowDescriptor?: RowDescriptor | undefined, mutationContextValues?: Map<string, ScalarPlanNode> | undefined, // Mutation context value expressions
-    contextAttributes?: Attribute[] | undefined, // Mutation context attributes
+    flatRowDescriptor?: RowDescriptor | undefined, 
+    /**
+     * Mutation context value expressions.
+     *
+     * NOTE: deliberately NOT exposed via `getChildren` (OPT-009): no emitter or rule reads
+     * this map from this node — only `DmlExecutorNode` / `ConstraintCheckNode` consume it,
+     * and they expose their copies. It is therefore a pass-through reference that goes
+     * stale (holds pre-rewrite subtrees) once the optimizer rebuilds those nodes. If
+     * anything ever starts reading it here, expose it as a child first.
+     */
+    mutationContextValues?: Map<string, ScalarPlanNode> | undefined, contextAttributes?: Attribute[] | undefined, // Mutation context attributes
     contextDescriptor?: RowDescriptor | undefined);
     getType(): RelationType;
     getAttributes(): readonly Attribute[];

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

@@ -1 +1 @@
-{"version":3,"file":"delete-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/delete-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAE,KAAK,cAAc,EAAE,KAAK,SAAS,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAoB,MAAM,gBAAgB,CAAC;AACvK,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;AAG7D;;GAEG;AACH,qBAAa,UAAW,SAAQ,QAAS,YAAW,kBAAkB;aAKlD,KAAK,EAAE,kBAAkB;aACzB,MAAM,EAAE,kBAAkB;aAC1B,gBAAgB,CAAC,EAAE,aAAa;aAChC,iBAAiB,CAAC,EAAE,aAAa;aACjC,qBAAqB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;aACnD,iBAAiB,CAAC,EAAE,SAAS,EAAE;aAC/B,iBAAiB,CAAC,EAAE,aAAa;IAVnD,SAAkB,QAAQ,uBAAuB;gBAG/C,KAAK,EAAE,KAAK,EACI,KAAK,EAAE,kBAAkB,EACzB,MAAM,EAAE,kBAAkB,EAAE,uDAAuD;IACnF,gBAAgB,CAAC,EAAE,aAAa,YAAA,EAAE,0BAA0B;IAC5D,iBAAiB,CAAC,EAAE,aAAa,YAAA,EACjC,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;IAKpD,OAAO,IAAI,YAAY;IAItB,aAAa,IAAI,SAAS,SAAS,EAAE;IAQrC,YAAY,IAAI,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAKjE,WAAW,IAAI,SAAS,QAAQ,EAAE;IAKlC,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;IA0BxD,eAAe,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAO9C,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAEQ,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAYzD"}
+{"version":3,"file":"delete-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/delete-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAE,KAAK,cAAc,EAAE,KAAK,SAAS,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAoB,MAAM,gBAAgB,CAAC;AACvK,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;AAG7D;;GAEG;AACH,qBAAa,UAAW,SAAQ,QAAS,YAAW,kBAAkB;aAKlD,KAAK,EAAE,kBAAkB;aACzB,MAAM,EAAE,kBAAkB;aAC1B,gBAAgB,CAAC,EAAE,aAAa;aAChC,iBAAiB,CAAC,EAAE,aAAa;IACjD;;;;;;;;OAQG;aACa,qBAAqB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;aACnD,iBAAiB,CAAC,EAAE,SAAS,EAAE;aAC/B,iBAAiB,CAAC,EAAE,aAAa;IAnBnD,SAAkB,QAAQ,uBAAuB;gBAG/C,KAAK,EAAE,KAAK,EACI,KAAK,EAAE,kBAAkB,EACzB,MAAM,EAAE,kBAAkB,EAAE,uDAAuD;IACnF,gBAAgB,CAAC,EAAE,aAAa,YAAA,EAAE,0BAA0B;IAC5D,iBAAiB,CAAC,EAAE,aAAa,YAAA;IACjD;;;;;;;;OAQG;IACa,qBAAqB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,YAAA,EACnD,iBAAiB,CAAC,EAAE,SAAS,EAAE,YAAA,EAAE,8BAA8B;IAC/D,iBAAiB,CAAC,EAAE,aAAa,YAAA;IAKpD,OAAO,IAAI,YAAY;IAItB,aAAa,IAAI,SAAS,SAAS,EAAE;IAQrC,YAAY,IAAI,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAKjE,WAAW,IAAI,SAAS,QAAQ,EAAE;IAKlC,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;IA0BxD,eAAe,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAO9C,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAEQ,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAYzD"}

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

@@ -15,8 +15,17 @@ export class DeleteNode extends PlanNode {
     nodeType = PlanNodeType.Delete;
     constructor(scope, table, source, // Typically a FilterNode wrapping a TableReferenceNode
     oldRowDescriptor, // For constraint checking
-    flatRowDescriptor, mutationContextValues, // Mutation context value expressions
-    contextAttributes, // Mutation context attributes
+    flatRowDescriptor, 
+    /**
+     * Mutation context value expressions.
+     *
+     * NOTE: deliberately NOT exposed via `getChildren` (OPT-009): no emitter or rule reads
+     * this map from this node — only `DmlExecutorNode` / `ConstraintCheckNode` consume it,
+     * and they expose their copies. It is therefore a pass-through reference that goes
+     * stale (holds pre-rewrite subtrees) once the optimizer rebuilds those nodes. If
+     * anything ever starts reading it here, expose it as a child first.
+     */
+    mutationContextValues, contextAttributes, // Mutation context attributes
     contextDescriptor) {
         super(scope);
         this.table = table;

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

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

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

@@ -15,6 +15,12 @@ export declare class DistinctNode extends PlanNode implements UnaryRelationalNod
     getChildren(): readonly [RelationalPlanNode];
     getRelations(): readonly [RelationalPlanNode];
     get estimatedRows(): number | undefined;
+    /**
+     * DISTINCT's row estimate as a pure function of the source cardinality, so the
+     * logical getter and `computePhysical` (which feeds it the PHYSICAL source
+     * count) cannot drift apart.
+     */
+    private rowsFrom;
     toString(): string;
     getLogicalAttributes(): Record<string, unknown>;
     computePhysical(childrenPhysical: PhysicalProperties[]): Partial<PhysicalProperties>;

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;IA0BpF,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;AAKhD;;;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,CAEtC;IAED;;;;OAIG;IACH,OAAO,CAAC,QAAQ;IAWP,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAQxD,eAAe,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA0BpF,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;CAuBzD"}

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

@@ -2,6 +2,7 @@ import { PlanNodeType } from './plan-node-type.js';
 import { PlanNode, isRelationalNode } from './plan-node.js';
 import { quereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
+import { physicalSourceRows } from '../util/row-estimates.js';
 /**
  * Represents a DISTINCT operation that eliminates duplicate rows.
  * It takes an input relation and outputs unique rows.
@@ -36,9 +37,16 @@ export class DistinctNode extends PlanNode {
         return [this.source];
     }
     get estimatedRows() {
+        return this.rowsFrom(this.source.estimatedRows);
+    }
+    /**
+     * DISTINCT's row estimate as a pure function of the source cardinality, so the
+     * logical getter and `computePhysical` (which feeds it the PHYSICAL source
+     * count) cannot drift apart.
+     */
+    rowsFrom(sourceRows) {
         // DISTINCT reduces the number of rows by eliminating duplicates
         // This is a rough estimate - in reality it depends on data distribution
-        const sourceRows = this.source.estimatedRows;
         if (sourceRows === undefined)
             return undefined;
         if (sourceRows <= 1)
@@ -69,7 +77,7 @@ export class DistinctNode extends PlanNode {
         // `RelationType.isSet` (set in getType()). FDs that the source proved on
         // proper subsets of the output (e.g., a PK FD) carry through unchanged.
         return {
-            estimatedRows: this.estimatedRows,
+            estimatedRows: this.rowsFrom(physicalSourceRows(sourcePhysical, this.source)),
             ordering: sourcePhysical?.ordering,
             monotonicOn,
             fds: sourcePhysical?.fds,

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":"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"}
+{"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/dml-executor-node.d.ts

@@ -5,6 +5,7 @@ import type { TableReferenceNode } from './reference.js';
 import type { RelationType } from '../../common/datatype.js';
 import type { ConflictResolution } from '../../common/constants.js';
 import { RowOp } from '../../common/types.js';
+import type { ConstraintCheck, NotNullDefaultPlan } from './constraint-check-node.js';
 /**
  * Represents a planned UPSERT clause for INSERT operations.
  * This contains the pre-built plan nodes for ON CONFLICT DO UPDATE handling.
@@ -34,6 +35,19 @@ export interface UpsertClausePlan {
      * - unqualified column names (existing row values) via existingRowDescriptor
      */
     assignments?: Map<number, ScalarPlanNode>;
+    /**
+     * Column indices whose entry in {@link assignments} is an implicit
+     * generated-column recompute rather than a user-written SET, listed in
+     * `generatedColumnTopoOrder`. The runtime evaluates these in a SECOND pass,
+     * after the user assignments have been applied and coerced into the updated
+     * row, so a generated column derives from the post-update image (and a
+     * generated-from-generated column sees the freshly computed value).
+     *
+     * Their expressions bind bare column names to the EXISTING-row attributes —
+     * the same attributes the user assignments read — but the second pass
+     * re-binds those attribute ids to the composed row via a cloned descriptor.
+     */
+    generatedAssignmentColumns?: number[];
     /** For 'update' action: optional WHERE condition plan */
     whereCondition?: ScalarPlanNode;
     /** Row descriptor for NEW.* references (proposed insert values) */
@@ -41,6 +55,29 @@ export interface UpsertClausePlan {
     /** Row descriptor for existing row references (conflict row) */
     existingRowDescriptor?: RowDescriptor;
 }
+/**
+ * UPDATE-shaped row validation for an INSERT's `on conflict … do update` arm.
+ *
+ * The arm composes its row *inside* the executor and writes it directly, so it can
+ * never reach the statement's ConstraintCheckNode (which is INSERT-shaped, and sits
+ * above the executor, seeing only the proposed insert row). This carries what
+ * `buildUpdateStmt` would have built for the same write: OLD = the conflicting stored
+ * row, NEW = the composed row.
+ *
+ * One set is shared by every clause of a multi-clause statement — the checks are a
+ * property of the table and the operation, not of the clause. The clause only decides
+ * *which* row is composed; the row is bound at runtime.
+ *
+ * Set only when at least one clause takes the `update` action.
+ */
+export interface UpsertUpdateValidation {
+    /** UPDATE-scoped CHECKs plus child-side and parent-side FK checks. */
+    checks: ConstraintCheck[];
+    /** Flat OLD|NEW descriptor the checks' column references bind through. */
+    flatRowDescriptor: RowDescriptor;
+    /** DEFAULT evaluators for NOT NULL columns — per-constraint REPLACE substitution. */
+    notNullDefaults: NotNullDefaultPlan[];
+}
 /**
  * Executes actual database insert/update/delete operations after constraint validation.
  * This node performs the actual vtab.update operations and yields the affected rows.
@@ -69,6 +106,12 @@ export declare class DmlExecutorNode extends PlanNode implements RelationalPlanN
      * spine) all leave it unset.
      */
     readonly lensRouted: boolean;
+    /**
+     * UPDATE-shaped validation for the `on conflict … do update` arm — see
+     * {@link UpsertUpdateValidation}. Set only on an INSERT whose statement has at
+     * least one `update`-action clause.
+     */
+    readonly upsertUpdateValidation?: UpsertUpdateValidation | undefined;
     readonly nodeType = PlanNodeType.UpdateExecutor;
     constructor(scope: Scope, source: RelationalPlanNode, table: TableReferenceNode, operation: RowOp, onConflict?: ConflictResolution | undefined, // Used for INSERT operations (legacy OR clause)
     mutationContextValues?: Map<string, ScalarPlanNode> | undefined, // Mutation context value expressions
@@ -88,10 +131,24 @@ export declare class DmlExecutorNode extends PlanNode implements RelationalPlanN
      * slot), and the multi-source / decomposition insert fan-out (no single basis
      * spine) all leave it unset.
      */
-    lensRouted?: boolean);
+    lensRouted?: boolean, 
+    /**
+     * UPDATE-shaped validation for the `on conflict … do update` arm — see
+     * {@link UpsertUpdateValidation}. Set only on an INSERT whose statement has at
+     * least one `update`-action clause.
+     */
+    upsertUpdateValidation?: UpsertUpdateValidation | undefined);
     getType(): RelationType;
     getAttributes(): readonly Attribute[];
     getRelations(): readonly [RelationalPlanNode, TableReferenceNode];
+    /** Upsert-clause expressions in canonical child order: per clause, assignments then WHERE. */
+    private upsertExpressions;
+    /**
+     * The DO UPDATE arm's validation expressions, in canonical child order: CHECK / FK
+     * expressions then NOT NULL DEFAULT evaluators. They MUST be children — the FK
+     * existence probes are `not exists (…)` subqueries, which do not work unoptimized.
+     */
+    private validationExpressions;
     getChildren(): readonly PlanNode[];
     withChildren(newChildren: readonly PlanNode[]): PlanNode;
     get estimatedRows(): number | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"dml-executor-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/dml-executor-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,kBAAkB,EAAE,KAAK,cAAc,EAAE,KAAK,aAAa,EAAoB,MAAM,gBAAgB,CAAC;AACvK,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,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAChC,+DAA+D;IAC/D,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC;;;;;;;;;;OAUG;IACH,wBAAwB,CAAC,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAC;IAClD,wEAAwE;IACxE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC7B;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC1C,yDAAyD;IACzD,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,mEAAmE;IACnE,gBAAgB,CAAC,EAAE,aAAa,CAAC;IACjC,gEAAgE;IAChE,qBAAqB,CAAC,EAAE,aAAa,CAAC;CACtC;AAED;;;;GAIG;AACH,qBAAa,eAAgB,SAAQ,QAAS,YAAW,kBAAkB;aAKvD,MAAM,EAAE,kBAAkB;aAC1B,KAAK,EAAE,kBAAkB;aACzB,SAAS,EAAE,KAAK;aAChB,UAAU,CAAC,EAAE,kBAAkB;aAC/B,qBAAqB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;aACnD,iBAAiB,CAAC,EAAE,SAAS,EAAE;aAC/B,iBAAiB,CAAC,EAAE,aAAa;aACjC,aAAa,CAAC,EAAE,gBAAgB,EAAE;IAClD;;;;;;;;;;;;OAYG;aACa,UAAU,EAAE,OAAO;IAzBrC,SAAkB,QAAQ,+BAA+B;gBAGvD,KAAK,EAAE,KAAK,EACI,MAAM,EAAE,kBAAkB,EAC1B,KAAK,EAAE,kBAAkB,EACzB,SAAS,EAAE,KAAK,EAChB,UAAU,CAAC,EAAE,kBAAkB,YAAA,EAAE,gDAAgD;IACjF,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,EAAE,kCAAkC;IACrE,aAAa,CAAC,EAAE,gBAAgB,EAAE,YAAA,EAAE,4CAA4C;IAChG;;;;;;;;;;;;OAYG;IACa,UAAU,GAAE,OAAe;IAK7C,OAAO,IAAI,YAAY;IAIvB,aAAa,IAAI,SAAS,SAAS,EAAE;IAIrC,YAAY,IAAI,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAIjE,WAAW,IAAI,SAAS,QAAQ,EAAE;IAIlC,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;IAiCxD,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAEQ,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IA2BxD,eAAe,IAAI,OAAO,CAAC,kBAAkB,CAAC;CAU/C"}
+{"version":3,"file":"dml-executor-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/dml-executor-node.ts"],"names":[],"mappings":"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"}

package/dist/src/planner/nodes/dml-executor-node.js

@@ -1,4 +1,4 @@
-import { PlanNode, isRelationalNode } from './plan-node.js';
+import { PlanNode, isRelationalNode, asScalarNodes } from './plan-node.js';
 import { PlanNodeType } from './plan-node-type.js';
 /**
  * Executes actual database insert/update/delete operations after constraint validation.
@@ -15,6 +15,7 @@ export class DmlExecutorNode extends PlanNode {
     contextDescriptor;
     upsertClauses;
     lensRouted;
+    upsertUpdateValidation;
     nodeType = PlanNodeType.UpdateExecutor;
     constructor(scope, source, table, operation, onConflict, // Used for INSERT operations (legacy OR clause)
     mutationContextValues, // Mutation context value expressions
@@ -34,7 +35,13 @@ export class DmlExecutorNode extends PlanNode {
      * slot), and the multi-source / decomposition insert fan-out (no single basis
      * spine) all leave it unset.
      */
-    lensRouted = false) {
+    lensRouted = false, 
+    /**
+     * UPDATE-shaped validation for the `on conflict … do update` arm — see
+     * {@link UpsertUpdateValidation}. Set only on an INSERT whose statement has at
+     * least one `update`-action clause.
+     */
+    upsertUpdateValidation) {
         super(scope);
         this.source = source;
         this.table = table;
@@ -45,6 +52,7 @@ export class DmlExecutorNode extends PlanNode {
         this.contextDescriptor = contextDescriptor;
         this.upsertClauses = upsertClauses;
         this.lensRouted = lensRouted;
+        this.upsertUpdateValidation = upsertUpdateValidation;
     }
     getType() {
         return this.source.getType();
@@ -55,25 +63,98 @@ export class DmlExecutorNode extends PlanNode {
     getRelations() {
         return [this.source, this.table];
     }
+    /** Upsert-clause expressions in canonical child order: per clause, assignments then WHERE. */
+    upsertExpressions() {
+        const out = [];
+        for (const clause of this.upsertClauses ?? []) {
+            if (clause.assignments)
+                out.push(...clause.assignments.values());
+            if (clause.whereCondition)
+                out.push(clause.whereCondition);
+        }
+        return out;
+    }
+    /**
+     * The DO UPDATE arm's validation expressions, in canonical child order: CHECK / FK
+     * expressions then NOT NULL DEFAULT evaluators. They MUST be children — the FK
+     * existence probes are `not exists (…)` subqueries, which do not work unoptimized.
+     */
+    validationExpressions() {
+        const validation = this.upsertUpdateValidation;
+        if (!validation)
+            return [];
+        return [
+            ...validation.checks.map(c => c.expression),
+            ...validation.notNullDefaults.map(d => d.defaultNode),
+        ];
+    }
     getChildren() {
-        return [this.source];
+        return [
+            this.source,
+            ...this.upsertExpressions(),
+            ...this.validationExpressions(),
+            ...(this.mutationContextValues?.values() ?? []),
+        ];
     }
     withChildren(newChildren) {
-        if (newChildren.length !== 1) {
-            throw new Error(`UpdateExecutorNode expects 1 child, got ${newChildren.length}`);
+        const upsertExprs = this.upsertExpressions();
+        const validation = this.upsertUpdateValidation;
+        const checkCount = validation?.checks.length ?? 0;
+        const defaultCount = validation?.notNullDefaults.length ?? 0;
+        const validationCount = checkCount + defaultCount;
+        const validationExprs = this.validationExpressions();
+        const ctxKeys = [...(this.mutationContextValues?.keys() ?? [])];
+        const ctxExprs = [...(this.mutationContextValues?.values() ?? [])];
+        const expected = 1 + upsertExprs.length + validationCount + ctxKeys.length;
+        if (newChildren.length !== expected) {
+            throw new Error(`UpdateExecutorNode expects ${expected} children, got ${newChildren.length}`);
         }
+        const validationStart = 1 + upsertExprs.length;
+        const ctxStart = validationStart + validationCount;
         const [newSource] = newChildren;
+        const newUpsertExprs = asScalarNodes(newChildren.slice(1, validationStart), 'DmlExecutorNode upsert');
+        const newValidationExprs = asScalarNodes(newChildren.slice(validationStart, ctxStart), 'DmlExecutorNode upsert validation');
+        const newCtxExprs = asScalarNodes(newChildren.slice(ctxStart), 'DmlExecutorNode context');
         // Type check
         if (!isRelationalNode(newSource)) {
             throw new Error('UpdateExecutorNode: child must be a RelationalPlanNode');
         }
         // Return same instance if nothing changed
-        if (newSource === this.source) {
+        const upsertUnchanged = newUpsertExprs.every((e, i) => e === upsertExprs[i]);
+        const validationUnchanged = newValidationExprs.every((e, i) => e === validationExprs[i]);
+        const ctxUnchanged = newCtxExprs.every((e, i) => e === ctxExprs[i]);
+        if (newSource === this.source && upsertUnchanged && validationUnchanged && ctxUnchanged) {
             return this;
         }
-        // Create new instance. lensRouted MUST be carried forward, or the optimizer
-        // drops the lens-routed parent-side FK semantics on any node rebuild.
-        return new DmlExecutorNode(this.scope, newSource, this.table, this.operation, this.onConflict, this.mutationContextValues, this.contextAttributes, this.contextDescriptor, this.upsertClauses, this.lensRouted);
+        const newValidation = validation
+            ? {
+                checks: validation.checks.map((check, i) => ({ ...check, expression: newValidationExprs[i] })),
+                flatRowDescriptor: validation.flatRowDescriptor,
+                notNullDefaults: validation.notNullDefaults.map((d, i) => ({
+                    ...d,
+                    defaultNode: newValidationExprs[checkCount + i],
+                })),
+            }
+            : undefined;
+        // Slice rewritten expressions back into their clause slots, same order as getChildren/upsertExpressions.
+        let cursor = 0;
+        const newUpsertClauses = this.upsertClauses?.map(clause => {
+            const next = { ...clause };
+            if (clause.assignments) {
+                next.assignments = new Map([...clause.assignments.keys()].map(colIndex => [colIndex, newUpsertExprs[cursor++]]));
+            }
+            if (clause.whereCondition) {
+                next.whereCondition = newUpsertExprs[cursor++];
+            }
+            return next;
+        });
+        const newContextValues = this.mutationContextValues
+            ? new Map(ctxKeys.map((k, i) => [k, newCtxExprs[i]]))
+            : undefined;
+        // Create new instance. lensRouted and upsertUpdateValidation MUST be carried
+        // forward, or the optimizer drops the lens-routed parent-side FK semantics — and
+        // the DO UPDATE arm's row validation — on any node rebuild.
+        return new DmlExecutorNode(this.scope, newSource, this.table, this.operation, this.onConflict, newContextValues, this.contextAttributes, this.contextDescriptor, newUpsertClauses, this.lensRouted, newValidation);
     }
     get estimatedRows() {
         return this.source.estimatedRows;
@@ -93,13 +174,24 @@ export class DmlExecutorNode extends PlanNode {
         if (this.lensRouted) {
             props.lensRouted = true;
         }
+        if (this.upsertUpdateValidation) {
+            props.upsertUpdateChecks = this.upsertUpdateValidation.checks.length;
+            props.upsertUpdateNotNullDefaults = this.upsertUpdateValidation.notNullDefaults.length;
+        }
         if (this.upsertClauses && this.upsertClauses.length > 0) {
-            props.upsertClauses = this.upsertClauses.map(clause => ({
-                action: clause.action,
-                hasConflictTarget: !!clause.conflictTargetIndices,
-                hasWhere: !!clause.whereCondition,
-                assignmentCount: clause.assignments?.size ?? 0
-            }));
+            props.upsertClauses = this.upsertClauses.map(clause => {
+                // `assignments` also carries the implicit generated-column recomputes; report
+                // the user's SET count separately so a plan golden reads the statement, not
+                // the target table's generated-column count.
+                const generatedCount = clause.generatedAssignmentColumns?.length ?? 0;
+                return {
+                    action: clause.action,
+                    hasConflictTarget: !!clause.conflictTargetIndices,
+                    hasWhere: !!clause.whereCondition,
+                    assignmentCount: (clause.assignments?.size ?? 0) - generatedCount,
+                    ...(generatedCount > 0 ? { generatedAssignmentCount: generatedCount } : {}),
+                };
+            });
         }
         return props;
     }

package/dist/src/planner/nodes/dml-executor-node.js.map

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

package/dist/src/planner/nodes/drop-assertion-node.d.ts

@@ -6,10 +6,11 @@ import { PlanNodeType } from './plan-node-type.js';
  * This is a DDL operation that removes an assertion from the schema.
  */
 export declare class DropAssertionNode extends VoidNode {
+    readonly schemaName: string;
     readonly name: string;
     readonly ifExists: boolean;
     readonly nodeType = PlanNodeType.DropAssertion;
-    constructor(scope: Scope, name: string, ifExists: boolean);
+    constructor(scope: Scope, schemaName: string, name: string, ifExists: boolean);
     toString(): string;
     getLogicalAttributes(): Record<string, unknown>;
     computePhysical(_children: readonly PhysicalProperties[]): Partial<PhysicalProperties>;

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

@@ -1 +1 @@
-{"version":3,"file":"drop-assertion-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/drop-assertion-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,qBAAa,iBAAkB,SAAQ,QAAQ;aAK3B,IAAI,EAAE,MAAM;aACZ,QAAQ,EAAE,OAAO;IALnC,SAAkB,QAAQ,8BAA8B;gBAGtD,KAAK,EAAE,KAAK,EACI,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO;IAK1B,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAO/C,eAAe,CAAC,SAAS,EAAE,SAAS,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAGhG"}
+{"version":3,"file":"drop-assertion-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/drop-assertion-node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,KAAK,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,qBAAa,iBAAkB,SAAQ,QAAQ;aAK3B,UAAU,EAAE,MAAM;aAClB,IAAI,EAAE,MAAM;aACZ,QAAQ,EAAE,OAAO;IANnC,SAAkB,QAAQ,8BAA8B;gBAGtD,KAAK,EAAE,KAAK,EACI,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO;IAK1B,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAQ/C,eAAe,CAAC,SAAS,EAAE,SAAS,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAGhG"}

package/dist/src/planner/nodes/drop-assertion-node.js

@@ -5,19 +5,22 @@ import { PlanNodeType } from './plan-node-type.js';
  * This is a DDL operation that removes an assertion from the schema.
  */
 export class DropAssertionNode extends VoidNode {
+    schemaName;
     name;
     ifExists;
     nodeType = PlanNodeType.DropAssertion;
-    constructor(scope, name, ifExists) {
+    constructor(scope, schemaName, name, ifExists) {
         super(scope);
+        this.schemaName = schemaName;
         this.name = name;
         this.ifExists = ifExists;
     }
     toString() {
-        return `DROP ASSERTION ${this.name}`;
+        return `DROP ASSERTION ${this.schemaName}.${this.name}`;
     }
     getLogicalAttributes() {
         return {
+            schemaName: this.schemaName,
             name: this.name,
             ifExists: this.ifExists,
         };

package/dist/src/planner/nodes/drop-assertion-node.js.map

@@ -1 +1 @@
-{"version":3,"file":"drop-assertion-node.js","sourceRoot":"","sources":["../../../../src/planner/nodes/drop-assertion-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAA2B,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,QAAQ;IAK3B;IACA;IALA,QAAQ,GAAG,YAAY,CAAC,aAAa,CAAC;IAExD,YACE,KAAY,EACI,IAAY,EACZ,QAAiB;QAEjC,KAAK,CAAC,KAAK,CAAC,CAAC;QAHG,SAAI,GAAJ,IAAI,CAAQ;QACZ,aAAQ,GAAR,QAAQ,CAAS;IAGnC,CAAC;IAEQ,QAAQ;QACf,OAAO,kBAAkB,IAAI,CAAC,IAAI,EAAE,CAAC;IACvC,CAAC;IAEQ,oBAAoB;QAC3B,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;IACJ,CAAC;IAEQ,eAAe,CAAC,SAAwC;QAC/D,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC7B,CAAC;CACF"}
+{"version":3,"file":"drop-assertion-node.js","sourceRoot":"","sources":["../../../../src/planner/nodes/drop-assertion-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAA2B,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,QAAQ;IAK3B;IACA;IACA;IANA,QAAQ,GAAG,YAAY,CAAC,aAAa,CAAC;IAExD,YACE,KAAY,EACI,UAAkB,EAClB,IAAY,EACZ,QAAiB;QAEjC,KAAK,CAAC,KAAK,CAAC,CAAC;QAJG,eAAU,GAAV,UAAU,CAAQ;QAClB,SAAI,GAAJ,IAAI,CAAQ;QACZ,aAAQ,GAAR,QAAQ,CAAS;IAGnC,CAAC;IAEQ,QAAQ;QACf,OAAO,kBAAkB,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1D,CAAC;IAEQ,oBAAoB;QAC3B,OAAO;YACL,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;IACJ,CAAC;IAEQ,eAAe,CAAC,SAAwC;QAC/D,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC7B,CAAC;CACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"eager-prefetch-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/eager-prefetch-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;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,qBAAa,iBAAkB,SAAQ,QAAS,YAAW,mBAAmB;aAK5D,MAAM,EAAE,kBAAkB;aAC1B,UAAU,EAAE,MAAM;IALnC,SAAkB,QAAQ,8BAA8B;gBAGvD,KAAK,EAAE,KAAK,EACI,MAAM,EAAE,kBAAkB,EAC1B,UAAU,GAAE,MAAW,EACvC,qBAAqB,CAAC,EAAE,MAAM;IAK/B,aAAa,IAAI,SAAS,SAAS,EAAE;IAIrC,OAAO,IAAI,YAAY;IAIvB,WAAW,IAAI,SAAS,CAAC,kBAAkB,CAAC;IAI5C,YAAY,IAAI,SAAS,CAAC,kBAAkB,CAAC;IAI7C,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;IAsBxD,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAED,eAAe,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAoB3E,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAMxD"}
+{"version":3,"file":"eager-prefetch-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/eager-prefetch-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;AAKhD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,qBAAa,iBAAkB,SAAQ,QAAS,YAAW,mBAAmB;aAK5D,MAAM,EAAE,kBAAkB;aAC1B,UAAU,EAAE,MAAM;IALnC,SAAkB,QAAQ,8BAA8B;gBAGvD,KAAK,EAAE,KAAK,EACI,MAAM,EAAE,kBAAkB,EAC1B,UAAU,GAAE,MAAW,EACvC,qBAAqB,CAAC,EAAE,MAAM;IAK/B,aAAa,IAAI,SAAS,SAAS,EAAE;IAIrC,OAAO,IAAI,YAAY;IAIvB,WAAW,IAAI,SAAS,CAAC,kBAAkB,CAAC;IAI5C,YAAY,IAAI,SAAS,CAAC,kBAAkB,CAAC;IAI7C,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;IAsBxD,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAEtC;IAED,eAAe,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAoB3E,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAMxD"}