@quereus/quereus 3.3.0 → 4.1.0

package/dist/src/planner/building/alter-table.js

@@ -3,11 +3,26 @@ import { AlterTableNode } from '../nodes/alter-table-node.js';
 import { buildTableReference } from './table.js';
 import { QuereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
+import { PlanNode } from '../nodes/plan-node.js';
+import { buildExpression } from './expression.js';
+import { buildRowDefaultScope } from './default-scope.js';
+import { validateDeterministicDefault } from '../validation/determinism-validator.js';
+import { tryFoldLiteral } from '../../parser/utils.js';
+import { inferType } from '../../types/registry.js';
+import { columnSchemaToScalarType } from '../type-utils.js';
+import { expressionToString } from '../../emit/ast-stringify.js';
+import { validateReservedTags } from '../../schema/reserved-tags.js';
+import { columnTagDiagnostics, raiseStmtTagDiagnostics } from './tag-diagnostics.js';
+import { planViewBody } from './create-view.js';
 export function buildAlterTableStmt(ctx, stmt) {
     const tableRetrieve = buildTableReference({ type: 'table', table: stmt.table }, ctx);
     const tableReference = tableRetrieve.tableRef; // Extract the actual TableReferenceNode
     switch (stmt.action.type) {
         case 'addConstraint': {
+            // Reject a typo'd / mis-sited reserved `quereus.*` tag on the constraint at
+            // plan-build, mirroring CREATE TABLE's named-constraint leg and SET TAGS — a
+            // bad tag can't be silently stored when introduced via ALTER ... ADD CONSTRAINT.
+            raiseStmtTagDiagnostics(validateReservedTags(stmt.action.constraint.tags, 'physical-constraint'), stmt);
             // Convert RowOp[] (e.g., ['insert','update']) to bitmask understood by runtime.
             const operations = stmt.action.constraint.operations ?? ['insert', 'update'];
             const constraintWithBitmask = {
@@ -27,16 +42,55 @@ export function buildAlterTableStmt(ctx, stmt) {
                 oldName: stmt.action.oldName,
                 newName: stmt.action.newName,
             });
-        case 'addColumn':
+        case 'addColumn': {
+            const column = stmt.action.column;
+            // Reject a typo'd / mis-sited reserved `quereus.*` tag on the new column or any
+            // of its inline named constraints at plan-build, before any heavier backfill /
+            // check compilation — shares CREATE TABLE's per-column accumulation
+            // (`columnTagDiagnostics`) so the two authoring surfaces can't drift.
+            raiseStmtTagDiagnostics(columnTagDiagnostics(column), stmt);
+            // Validate the DEFAULT through the shared DDL validator (bind params / bare
+            // columns / non-determinism rejected; `new.<column>` accepted with its build
+            // deferred). This runs before building the backfill so a bare-column default
+            // is rejected here rather than silently resolving against the existing columns
+            // the backfill scope exposes.
+            const defaultConstraint = column.constraints?.find(c => c.type === 'default');
+            if (defaultConstraint?.expr) {
+                const hasMutationContext = !!tableReference.tableSchema.mutationContext
+                    && tableReference.tableSchema.mutationContext.length > 0;
+                ctx.schemaManager.validateAddColumnDefault(defaultConstraint.expr, column.name, tableReference.tableSchema.name, hasMutationContext);
+            }
+            const backfill = buildAddColumnBackfill(ctx, tableReference, column);
+            // For the per-row (evaluator) default path, enforce any CHECK on the new column
+            // against each backfilled row by compiling the predicates here and evaluating them
+            // inside the per-row backfill hook (mirrors the NOT NULL per-row path) — a violating
+            // row aborts the ALTER before any tree/batch swap. The literal-default path is left to
+            // the post-backfill scan (`validateBackfillAgainstChecks`), so checks are only
+            // compiled when a backfill is present.
+            const checks = backfill ? buildAddColumnChecks(ctx, tableReference, column) : undefined;
             return new AlterTableNode(ctx.scope, tableReference, {
                 type: 'addColumn',
-                column: stmt.action.column,
+                column,
+                backfill,
+                checks,
             });
+        }
         case 'dropColumn':
             return new AlterTableNode(ctx.scope, tableReference, {
                 type: 'dropColumn',
                 name: stmt.action.name,
             });
+        case 'dropConstraint':
+            return new AlterTableNode(ctx.scope, tableReference, {
+                type: 'dropConstraint',
+                name: stmt.action.name,
+            });
+        case 'renameConstraint':
+            return new AlterTableNode(ctx.scope, tableReference, {
+                type: 'renameConstraint',
+                oldName: stmt.action.oldName,
+                newName: stmt.action.newName,
+            });
         case 'alterPrimaryKey':
             return new AlterTableNode(ctx.scope, tableReference, {
                 type: 'alterPrimaryKey',
@@ -49,11 +103,166 @@ export function buildAlterTableStmt(ctx, stmt) {
                 setNotNull: stmt.action.setNotNull,
                 setDataType: stmt.action.setDataType,
                 setDefault: stmt.action.setDefault,
+                setCollation: stmt.action.setCollation,
             });
+        case 'setTags': {
+            // Validate any reserved `quereus.*` tags at the matching site so a typo
+            // (e.g. `quereus.expose_implicit_indx`) fails loudly here rather than being
+            // stored. The CREATE / declarative paths route tags through the same registry.
+            const target = stmt.action.target;
+            const site = target.kind === 'column' ? 'physical-column'
+                : target.kind === 'constraint' ? 'physical-constraint'
+                    : 'physical-table';
+            // Routed through the shared helper (rather than the policy call inline) so every
+            // plan-build tag surface raises through one site and a sited error here now
+            // carries the statement's source location too.
+            raiseStmtTagDiagnostics(validateReservedTags(stmt.action.tags, site), stmt);
+            return new AlterTableNode(ctx.scope, tableReference, {
+                type: 'setTags',
+                target,
+                mode: stmt.action.mode,
+                tags: stmt.action.tags,
+            });
+        }
+        case 'dropTags': {
+            // DROP TAGS removes tags by key, so there is NO reserved-tag value
+            // validation here (dropping a reserved key is legitimate — it removes an
+            // override). Resolve the same target plumbing as setTags and let the
+            // SchemaManager raise NOTFOUND atomically when a listed key is absent.
+            return new AlterTableNode(ctx.scope, tableReference, {
+                type: 'dropTags',
+                target: stmt.action.target,
+                keys: stmt.action.keys,
+            });
+        }
+        case 'setMaintained': {
+            // SET MAINTAINED AS <body> — attach / re-attach a derivation. Reuse the
+            // CREATE VIEW body gate so a DML body or non-relational body is rejected
+            // here with the same sited diagnostics as CREATE MATERIALIZED VIEW. The
+            // full shape check (arity/names/types/collations/PK) and the reconcile
+            // run in the emitter against the LIVE catalog state — deliberately not
+            // here: the build-time schema may be a cached statement's snapshot, and
+            // a shape mismatch over the implicit form is no longer an error but a
+            // reshape-on-attach (attachMaintainedDerivation), so a build-time arity
+            // gate would block legitimate reshapes.
+            const tableSchema = tableReference.tableSchema;
+            planViewBody(ctx, tableSchema.name, stmt.action.select);
+            // Mirror the create-form gate: a generated column would silently diverge
+            // from its expression once the body supplies every column's value.
+            const generated = tableSchema.columns.find(c => c.generated);
+            if (generated) {
+                throw new QuereusError(`cannot attach derivation to '${tableSchema.name}': column '${generated.name}' is generated — a maintained table's columns are all derived by the body`, StatusCode.ERROR, undefined, stmt.table.loc?.start.line, stmt.table.loc?.start.column);
+            }
+            // The module is the table's identity (no `using` clause on attach); it
+            // must be able to host a maintained backing.
+            if (!tableSchema.vtabModule?.getBackingHost) {
+                throw new QuereusError(`cannot attach derivation to '${tableSchema.name}': module '${tableSchema.vtabModuleName}' cannot host a maintained table (it does not implement the backing-host capability)`, StatusCode.UNSUPPORTED, undefined, stmt.table.loc?.start.line, stmt.table.loc?.start.column);
+            }
+            return new AlterTableNode(ctx.scope, tableReference, {
+                // Any `with defaults (…)` rides inside stmt.action.select.
+                type: 'setMaintained',
+                columns: stmt.action.columns,
+                select: stmt.action.select,
+            });
+        }
+        case 'dropMaintained':
+            // Maintained-ness is checked in the emitter against the LIVE table (the
+            // build-time schema may be a cached statement's snapshot).
+            return new AlterTableNode(ctx.scope, tableReference, { type: 'dropMaintained' });
         default:
             throw new QuereusError(
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             `Unknown ALTER TABLE action: ${stmt.action.type}`, StatusCode.INTERNAL);
     }
 }
+/**
+ * Compile the per-row backfill of an ADD COLUMN whose DEFAULT does not fold to a
+ * literal (e.g. `new.<col>`). Mirrors the single-source INSERT row-expansion and the
+ * view-write key default: the default is built against the table's *existing* columns
+ * as the "supplied" row, so `new.<col>` resolves to the existing row's sibling during
+ * backfill. Returns `undefined` for a missing or literal-folding default (the module
+ * bulk-writes those), so the common case allocates nothing.
+ */
+function buildAddColumnBackfill(ctx, tableReference, columnDef) {
+    const defaultExpr = columnDef.constraints?.find(c => c.type === 'default')?.expr;
+    if (!defaultExpr)
+        return undefined;
+    // Literal / NULL defaults fold and are bulk-written by the module — no per-row node.
+    if (tryFoldLiteral(defaultExpr) !== undefined)
+        return undefined;
+    const tableSchema = tableReference.tableSchema;
+    // Fresh attributes for the existing columns, referenced only by this default's
+    // `new.<col>` column refs and resolved at runtime via the row slot the emitter
+    // installs over each existing row. Minting fresh (rather than reusing the table
+    // reference's attributes) keeps the node self-contained so the optimizer can't
+    // dangle it.
+    const rowAttrs = tableSchema.columns.map(column => ({
+        id: PlanNode.nextAttrId(),
+        name: column.name,
+        type: columnSchemaToScalarType(column),
+        sourceRelation: 'add-column-backfill',
+    }));
+    const rowScope = buildRowDefaultScope(ctx.scope, tableSchema.columns, rowAttrs);
+    const node = buildExpression({ ...ctx, scope: rowScope }, defaultExpr);
+    if (!ctx.db.options.getBooleanOption('nondeterministic_schema')) {
+        validateDeterministicDefault(node, columnDef.name, tableSchema.name);
+    }
+    const rowDescriptor = [];
+    rowAttrs.forEach((attr, index) => { rowDescriptor[attr.id] = index; });
+    return { node, rowDescriptor };
+}
+/**
+ * Compile the column-level CHECK predicates of an ADD COLUMN whose DEFAULT does not fold
+ * to a literal, so they can be enforced per backfilled row inside the backfill hook. Each
+ * predicate is built against a row scope covering the table's *existing* columns plus the
+ * *new* column, so a CHECK referencing the new column (bare `<col>` or `new.<col>`) and any
+ * existing sibling resolves. The new column sits at position `existingColumns.length` in the
+ * row descriptor; the emitter sets that slot to `[...existingRow, backfilledValue]` per row.
+ * Returns `undefined` when the column carries no CHECK (the common case allocates nothing).
+ */
+function buildAddColumnChecks(ctx, tableReference, columnDef) {
+    const checkConstraints = (columnDef.constraints ?? []).filter(c => c.type === 'check' && c.expr);
+    if (checkConstraints.length === 0)
+        return undefined;
+    const tableSchema = tableReference.tableSchema;
+    // Fresh attributes for the existing columns followed by the new column. The new column's
+    // logical type / nullability come from the column def (same inference the schema builder
+    // uses); refs in the CHECK resolve through the row slot the emitter installs per row.
+    const existingAttrs = tableSchema.columns.map(column => ({
+        id: PlanNode.nextAttrId(),
+        name: column.name,
+        type: columnSchemaToScalarType(column),
+        sourceRelation: 'add-column-check',
+    }));
+    const newColNotNull = (columnDef.constraints ?? []).some(c => c.type === 'notNull');
+    // Carry the new column's declared collation so a CHECK comparison over it (e.g.
+    // `c = 'ABC'` on a `collate nocase` column) resolves the same collation at backfill
+    // time as it would at write time.
+    const newColCollation = columnDef.constraints?.find(c => c.type === 'collate')?.collation;
+    const newColAttr = {
+        id: PlanNode.nextAttrId(),
+        name: columnDef.name,
+        type: {
+            typeClass: 'scalar',
+            logicalType: inferType(columnDef.dataType),
+            nullable: !newColNotNull,
+            isReadOnly: false,
+            collationName: newColCollation,
+            // From an explicit COLLATE constraint on the new column — 'declared' by definition.
+            collationSource: newColCollation !== undefined ? 'declared' : undefined,
+        },
+        sourceRelation: 'add-column-check',
+    };
+    const rowAttrs = [...existingAttrs, newColAttr];
+    const targetColumns = [...tableSchema.columns, { name: columnDef.name }];
+    const rowScope = buildRowDefaultScope(ctx.scope, targetColumns, rowAttrs);
+    const predicates = checkConstraints.map(con => ({
+        node: buildExpression({ ...ctx, scope: rowScope }, con.expr),
+        name: con.name,
+        exprText: expressionToString(con.expr),
+    }));
+    const rowDescriptor = [];
+    rowAttrs.forEach((attr, index) => { rowDescriptor[attr.id] = index; });
+    return { predicates, rowDescriptor };
+}
 //# sourceMappingURL=alter-table.js.map

package/dist/src/planner/building/alter-table.js.map

@@ -1 +1 @@
-{"version":3,"file":"alter-table.js","sourceRoot":"","sources":["../../../../src/planner/building/alter-table.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGnD,MAAM,UAAU,mBAAmB,CACjC,GAAoB,EACpB,IAAwB;IAExB,MAAM,aAAa,GAAG,mBAAmB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;IACrF,MAAM,cAAc,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC,wCAAwC;IAEvF,QAAQ,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACzB,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,gFAAgF;YAChF,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,IAAI,CAAC,QAAQ,EAAC,QAAQ,CAAC,CAAC;YAE5E,MAAM,qBAAqB,GAAG;gBAC5B,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU;gBACzB,UAAU;aACX,CAAC;YAEF,OAAO,IAAI,iBAAiB,CAC1B,GAAG,CAAC,KAAK,EACT,cAAc,EACd,qBAAqB,CACtB,CAAC;QACN,CAAC;QAEC,KAAK,aAAa;YAChB,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE;gBACnD,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;aAC7B,CAAC,CAAC;QAEL,KAAK,cAAc;YACjB,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE;gBACnD,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBAC5B,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;aAC7B,CAAC,CAAC;QAEL,KAAK,WAAW;YACd,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE;gBACnD,IAAI,EAAE,WAAW;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;aAC3B,CAAC,CAAC;QAEL,KAAK,YAAY;YACf,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE;gBACnD,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;aACvB,CAAC,CAAC;QAEL,KAAK,iBAAiB;YACpB,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE;gBACnD,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;aAC7B,CAAC,CAAC;QAEL,KAAK,aAAa;YAChB,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE;gBACnD,IAAI,EAAE,aAAa;gBACnB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;gBAClC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;gBAClC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;gBACpC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU;aACnC,CAAC,CAAC;QAEL;YACE,MAAM,IAAI,YAAY;YACpB,8DAA8D;YAC9D,+BAAgC,IAAI,CAAC,MAAc,CAAC,IAAI,EAAE,EAC1D,UAAU,CAAC,QAAQ,CACpB,CAAC;IACN,CAAC;AACH,CAAC"}
+{"version":3,"file":"alter-table.js","sourceRoot":"","sources":["../../../../src/planner/building/alter-table.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAqB9D,wBAAgB,UAAU,CAAC,GAAG,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,SAAS,CAgFvF"}
+{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AA2B9D,wBAAgB,UAAU,CAAC,GAAG,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,SAAS,CA8FvF"}

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

@@ -5,6 +5,7 @@ import { buildCreateIndexStmt } from './ddl.js';
 import { buildDropTableStmt } from './drop-table.js';
 import { buildCreateViewStmt } from './create-view.js';
 import { buildDropViewStmt } from './drop-view.js';
+import { buildCreateMaterializedViewStmt, buildRefreshMaterializedViewStmt, buildDropMaterializedViewStmt, } from './materialized-view.js';
 import { buildCreateAssertionStmt } from './create-assertion.js';
 import { buildDropAssertionStmt } from './drop-assertion.js';
 import { buildDropIndexStmt } from './drop-index.js';
@@ -12,13 +13,14 @@ import { buildInsertStmt } from './insert.js';
 import { buildUpdateStmt } from './update.js';
 import { buildDeleteStmt } from './delete.js';
 import { buildAlterTableStmt } from './alter-table.js';
+import { buildAlterViewStmt, buildAlterMaterializedViewStmt, buildAlterIndexStmt } from './set-object-tags.js';
 import { buildBeginStmt, buildCommitStmt, buildRollbackStmt, buildSavepointStmt, buildReleaseStmt } from './transaction.js';
 import { buildPragmaStmt } from './pragma.js';
 import { buildAnalyzeStmt } from './analyze.js';
 import { buildValuesStmt } from './select.js';
 import { quereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
-import { buildDeclareSchemaStmt, buildDiffSchemaStmt, buildApplySchemaStmt, buildExplainSchemaStmt } from './declare-schema.js';
+import { buildDeclareSchemaStmt, buildDeclareLensStmt, buildDiffSchemaStmt, buildApplySchemaStmt, buildExplainSchemaStmt } from './declare-schema.js';
 export function buildBlock(ctx, statements) {
     const plannedStatements = statements.map((stmt) => {
         switch (stmt.type) {
@@ -31,6 +33,10 @@ export function buildBlock(ctx, statements) {
                 return buildCreateIndexStmt(ctx, stmt);
             case 'createView':
                 return buildCreateViewStmt(ctx, stmt);
+            case 'createMaterializedView':
+                return buildCreateMaterializedViewStmt(ctx, stmt);
+            case 'refreshMaterializedView':
+                return buildRefreshMaterializedViewStmt(ctx, stmt);
             case 'createAssertion':
                 return buildCreateAssertionStmt(ctx, stmt);
             case 'drop': {
@@ -41,6 +47,9 @@ export function buildBlock(ctx, statements) {
                 else if (dropStmt.objectType === 'view') {
                     return buildDropViewStmt(ctx, dropStmt);
                 }
+                else if (dropStmt.objectType === 'materializedView') {
+                    return buildDropMaterializedViewStmt(ctx, dropStmt);
+                }
                 else if (dropStmt.objectType === 'assertion') {
                     return buildDropAssertionStmt(ctx, dropStmt);
                 }
@@ -74,10 +83,18 @@ export function buildBlock(ctx, statements) {
                 return buildAnalyzeStmt(ctx, stmt);
             case 'alterTable':
                 return buildAlterTableStmt(ctx, stmt);
+            case 'alterView':
+                return buildAlterViewStmt(ctx, stmt);
+            case 'alterMaterializedView':
+                return buildAlterMaterializedViewStmt(ctx, stmt);
+            case 'alterIndex':
+                return buildAlterIndexStmt(ctx, stmt);
             case 'values':
                 return buildValuesStmt(ctx, stmt);
             case 'declareSchema':
                 return buildDeclareSchemaStmt(ctx, stmt);
+            case 'declareLens':
+                return buildDeclareLensStmt(ctx, stmt);
             case 'diffSchema':
                 return buildDiffSchemaStmt(ctx, stmt);
             case 'applySchema':

package/dist/src/planner/building/block.js.map

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

package/dist/src/planner/building/constraint-builder.d.ts

@@ -1,13 +1,21 @@
 import type { PlanningContext } from '../planning-context.js';
-import type { TableSchema } from '../../schema/table.js';
+import type { TableSchema, RowConstraintSchema } from '../../schema/table.js';
 import { RowOpFlag } from '../../schema/table.js';
 import type { Attribute, RowDescriptor } from '../nodes/plan-node.js';
 import type { ConstraintCheck, NotNullDefaultPlan } from '../nodes/constraint-check-node.js';
+import type { Scope } from '../scopes/scope.js';
 /**
  * Builds constraint check expressions at plan time.
  * This allows the optimizer to see and optimize constraint expressions.
  */
-export declare function buildConstraintChecks(ctx: PlanningContext, tableSchema: TableSchema, operation: RowOpFlag, oldAttributes: Attribute[], newAttributes: Attribute[], _flatRowDescriptor: RowDescriptor, contextAttributes?: Attribute[]): ConstraintCheck[];
+export declare function buildConstraintChecks(ctx: PlanningContext, tableSchema: TableSchema, operation: RowOpFlag, oldAttributes: Attribute[], newAttributes: Attribute[], _flatRowDescriptor: RowDescriptor, contextAttributes?: Attribute[], 
+/**
+ * Extra CHECK constraints to enforce alongside the table's own — already
+ * resolved in this table's column space. The lens layer threads its logical
+ * `enforced-row-local` checks (rewritten from logical→basis terms) through here
+ * so they fire on a write through the lens (see `planner/mutation/lens-enforcement.ts`).
+ */
+additionalConstraints?: ReadonlyArray<RowConstraintSchema>): ConstraintCheck[];
 /**
  * Pre-builds DEFAULT-value evaluators for every NOT NULL column that has a
  * DEFAULT clause. The returned plans are consumed by the constraint-check
@@ -15,8 +23,28 @@ export declare function buildConstraintChecks(ctx: PlanningContext, tableSchema:
  * (per SQLite OR REPLACE semantics on NOT NULL).
  *
  * Defaults are evaluated against the same scope used for CHECK constraints:
- * unqualified column names resolve to NEW attributes (which is fine — defaults
- * may not reference columns, but we share the scope for consistency).
+ * every column resolves as `new.<col>` (and unqualified, unless shadowed by a
+ * mutation-context variable), so a NOT NULL default may read a sibling via
+ * `new.<column>` just like the row-expansion path. Note the timing difference:
+ * this substitution fires when REPLACE swaps in a default for an explicit NULL,
+ * by which point the row is fully materialised — so `new.<col>` here sees the
+ * final row value of *any* column, whereas the row-expansion path exposes only
+ * the columns the INSERT actually supplied (omitted siblings are unresolved
+ * there to avoid a default-evaluation-order race).
+ *
+ * Error attribution for a NOT NULL violation is NOT decided here: it happens at
+ * check time in `checkNotNullConstraints` by column index (the first NOT-NULL
+ * column with a NULL effective value), so don't look for it in this builder.
+ */
+export declare function buildNotNullDefaults(ctx: PlanningContext, tableSchema: TableSchema, newAttributes: Attribute[], contextAttributes?: Attribute[], 
+/**
+ * Parent scope for `new.<col>` resolution, threaded by a synthetic decomposition /
+ * multi-source member insert (see {@link buildInsertStmt}'s `defaultRowContextScope`).
+ * It exposes the **produced logical row's** supplied columns as `new.<col>`, so a NOT
+ * NULL column's default can correlate on a sibling logical column the member's own base
+ * table does not carry (e.g. an anchor key-column default
+ * `default (select … where parent.key = new.<fk>)`). The member's own NEW columns are
+ * registered below and shadow it. `undefined` (⇒ `ctx.scope`) for an ordinary insert.
  */
-export declare function buildNotNullDefaults(ctx: PlanningContext, tableSchema: TableSchema, newAttributes: Attribute[], contextAttributes?: Attribute[]): NotNullDefaultPlan[];
+defaultRowContextScope?: Scope): NotNullDefaultPlan[];
 //# sourceMappingURL=constraint-builder.d.ts.map

package/dist/src/planner/building/constraint-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constraint-builder.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/constraint-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAmB7F;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,eAAe,EACpB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,SAAS,EAAE,EAC1B,aAAa,EAAE,SAAS,EAAE,EAC1B,kBAAkB,EAAE,aAAa,EACjC,iBAAiB,GAAE,SAAS,EAAO,GAClC,eAAe,EAAE,CAyInB;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,eAAe,EACpB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,SAAS,EAAE,EAC1B,iBAAiB,GAAE,SAAS,EAAO,GAClC,kBAAkB,EAAE,CA0DtB"}
+{"version":3,"file":"constraint-builder.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/constraint-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAE7F,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAqBhD;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,eAAe,EACpB,WAAW,EAAE,WAAW,EACxB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,SAAS,EAAE,EAC1B,aAAa,EAAE,SAAS,EAAE,EAC1B,kBAAkB,EAAE,aAAa,EACjC,iBAAiB,GAAE,SAAS,EAAO;AACnC;;;;;GAKG;AACH,qBAAqB,GAAE,aAAa,CAAC,mBAAmB,CAAM,GAC7D,eAAe,EAAE,CAsJnB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,eAAe,EACpB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,SAAS,EAAE,EAC1B,iBAAiB,GAAE,SAAS,EAAO;AACnC;;;;;;;;GAQG;AACH,sBAAsB,CAAC,EAAE,KAAK,GAC7B,kBAAkB,EAAE,CAqDtB"}

package/dist/src/planner/building/constraint-builder.js

@@ -5,6 +5,9 @@ import { PlanNodeType } from '../nodes/plan-node-type.js';
 import { ColumnReferenceNode } from '../nodes/reference.js';
 import { TableReferenceNode } from '../nodes/reference.js';
 import { validateDeterministicConstraint } from '../validation/determinism-validator.js';
+import { columnSchemaToScalarType } from '../type-utils.js';
+import { stripSelfQualifierInCheckExpression } from '../../schema/rename-rewriter.js';
+import { cloneExpr } from '../mutation/scope-transform.js';
 /**
  * Determines if a constraint should be checked for the given operation
  */
@@ -16,7 +19,14 @@ function shouldCheckConstraint(constraint, operation) {
  * Builds constraint check expressions at plan time.
  * This allows the optimizer to see and optimize constraint expressions.
  */
-export function buildConstraintChecks(ctx, tableSchema, operation, oldAttributes, newAttributes, _flatRowDescriptor, contextAttributes = []) {
+export function buildConstraintChecks(ctx, tableSchema, operation, oldAttributes, newAttributes, _flatRowDescriptor, contextAttributes = [], 
+/**
+ * Extra CHECK constraints to enforce alongside the table's own — already
+ * resolved in this table's column space. The lens layer threads its logical
+ * `enforced-row-local` checks (rewritten from logical→basis terms) through here
+ * so they fire on a write through the lens (see `planner/mutation/lens-enforcement.ts`).
+ */
+additionalConstraints = []) {
     // Build attribute ID mappings for column registration
     const newAttrIdByCol = {};
     const oldAttrIdByCol = {};
@@ -32,9 +42,10 @@ export function buildConstraintChecks(ctx, tableSchema, operation, oldAttributes
             oldAttrIdByCol[column.name.toLowerCase()] = attr.id;
         }
     });
-    // Filter constraints by operation
-    const applicableConstraints = tableSchema.checkConstraints
+    // Filter constraints by operation (the table's own plus any threaded extras)
+    const applicableConstraints = [...tableSchema.checkConstraints, ...additionalConstraints]
         .filter(constraint => shouldCheckConstraint(constraint, operation));
+    const resolveColumnInSource = (schemaName, tableName, columnName) => ctx.schemaManager.getSchema(schemaName)?.getTable(tableName)?.columnIndexMap.has(columnName.toLowerCase()) ?? false;
     // Build expression nodes for each constraint
     return applicableConstraints.map(constraint => {
         // Create scope with OLD/NEW column access for constraint evaluation
@@ -55,12 +66,10 @@ export function buildConstraintChecks(ctx, tableSchema, operation, oldAttributes
             // Register NEW.col and unqualified col (defaults to NEW for INSERT/UPDATE, OLD for DELETE)
             const newAttrId = newAttrIdByCol[colNameLower];
             if (newAttrId !== undefined) {
-                const newColumnType = {
-                    typeClass: 'scalar',
-                    logicalType: tableColumn.logicalType,
-                    nullable: !tableColumn.notNull,
-                    isReadOnly: false
-                };
+                // Write-time CHECK comparisons must resolve the column's declared
+                // collation, matching read-path queries, ALTER backfill validation,
+                // and assertion enforcement (all compile plain SQL over the schema).
+                const newColumnType = columnSchemaToScalarType(tableColumn);
                 // NEW.column
                 constraintScope.registerSymbol(`new.${colNameLower}`, (exp, s) => new ColumnReferenceNode(s, exp, newColumnType, newAttrId, tableColIndex));
                 // For INSERT/UPDATE, unqualified column defaults to NEW
@@ -71,12 +80,8 @@ export function buildConstraintChecks(ctx, tableSchema, operation, oldAttributes
             // Register OLD.col
             const oldAttrId = oldAttrIdByCol[colNameLower];
             if (oldAttrId !== undefined) {
-                const oldColumnType = {
-                    typeClass: 'scalar',
-                    logicalType: tableColumn.logicalType,
-                    nullable: true, // OLD values can be NULL (especially for INSERT)
-                    isReadOnly: false
-                };
+                // OLD values can be NULL (especially for INSERT)
+                const oldColumnType = columnSchemaToScalarType(tableColumn, { nullable: true });
                 // OLD.column
                 constraintScope.registerSymbol(`old.${colNameLower}`, (exp, s) => new ColumnReferenceNode(s, exp, oldColumnType, oldAttrId, tableColIndex));
                 // For DELETE, unqualified column defaults to OLD
@@ -98,10 +103,25 @@ export function buildConstraintChecks(ctx, tableSchema, operation, oldAttributes
             // This ensures unqualified table references in subqueries resolve to the same schema
             const constraintSchemaPath = [tableSchema.schemaName];
             const constraintCtx = { ...ctx, scope: constraintScope, schemaPath: constraintSchemaPath };
-            const expression = buildExpression(constraintCtx, constraint.expr);
-            // Validate that the constraint expression is deterministic
+            // Fold table-qualified self-references (`check (t.qty > 0)`) to the bare
+            // column form the row-context scope registers. Done as an AST rewrite on a
+            // clone (never the stored constraint) rather than by seeding `<table>.<col>`
+            // scope keys: this scope is an ancestor of every subquery planned inside
+            // the CHECK, and qualified keys would shadow inner relations through join
+            // peers' parent-chain fallback.
+            let constraintExpr = constraint.expr;
+            const stripped = cloneExpr(constraint.expr);
+            if (stripSelfQualifierInCheckExpression(stripped, tableSchema.name, tableSchema.schemaName, resolveColumnInSource)) {
+                constraintExpr = stripped;
+            }
+            const expression = buildExpression(constraintCtx, constraintExpr);
+            // Validate that the constraint expression is deterministic — skip when
+            // `nondeterministic_schema` is on; per-row resolution + replay-at-module
+            // boundary keeps the capture safe even with non-det inside CHECKs.
             const constraintName = constraint.name ?? `_check_${tableSchema.name}`;
-            validateDeterministicConstraint(expression, constraintName, tableSchema.name);
+            if (!ctx.db.options.getBooleanOption('nondeterministic_schema')) {
+                validateDeterministicConstraint(expression, constraintName, tableSchema.name);
+            }
             // Heuristic: auto-defer if the expression contains a subquery
             // or references committed.* state (which necessarily implies a subquery, but
             // this defensive check ensures committed-ref constraints are always deferred
@@ -131,10 +151,30 @@ export function buildConstraintChecks(ctx, tableSchema, operation, oldAttributes
  * (per SQLite OR REPLACE semantics on NOT NULL).
  *
  * Defaults are evaluated against the same scope used for CHECK constraints:
- * unqualified column names resolve to NEW attributes (which is fine — defaults
- * may not reference columns, but we share the scope for consistency).
+ * every column resolves as `new.<col>` (and unqualified, unless shadowed by a
+ * mutation-context variable), so a NOT NULL default may read a sibling via
+ * `new.<column>` just like the row-expansion path. Note the timing difference:
+ * this substitution fires when REPLACE swaps in a default for an explicit NULL,
+ * by which point the row is fully materialised — so `new.<col>` here sees the
+ * final row value of *any* column, whereas the row-expansion path exposes only
+ * the columns the INSERT actually supplied (omitted siblings are unresolved
+ * there to avoid a default-evaluation-order race).
+ *
+ * Error attribution for a NOT NULL violation is NOT decided here: it happens at
+ * check time in `checkNotNullConstraints` by column index (the first NOT-NULL
+ * column with a NULL effective value), so don't look for it in this builder.
+ */
+export function buildNotNullDefaults(ctx, tableSchema, newAttributes, contextAttributes = [], 
+/**
+ * Parent scope for `new.<col>` resolution, threaded by a synthetic decomposition /
+ * multi-source member insert (see {@link buildInsertStmt}'s `defaultRowContextScope`).
+ * It exposes the **produced logical row's** supplied columns as `new.<col>`, so a NOT
+ * NULL column's default can correlate on a sibling logical column the member's own base
+ * table does not carry (e.g. an anchor key-column default
+ * `default (select … where parent.key = new.<fk>)`). The member's own NEW columns are
+ * registered below and shadow it. `undefined` (⇒ `ctx.scope`) for an ordinary insert.
  */
-export function buildNotNullDefaults(ctx, tableSchema, newAttributes, contextAttributes = []) {
+defaultRowContextScope) {
     const result = [];
     for (let columnIndex = 0; columnIndex < tableSchema.columns.length; columnIndex++) {
         const column = tableSchema.columns[columnIndex];
@@ -143,7 +183,7 @@ export function buildNotNullDefaults(ctx, tableSchema, newAttributes, contextAtt
         const defaultExpr = column.defaultValue;
         if (!defaultExpr || typeof defaultExpr !== 'object' || !('type' in defaultExpr))
             continue;
-        const scope = new RegisteredScope(ctx.scope);
+        const scope = new RegisteredScope(defaultRowContextScope ?? ctx.scope);
         const reservedKeys = new Set();
         // Mutation context variables first so they shadow column names if conflicts exist
         // (matches createRowExpansionProjection's resolution order).
@@ -164,12 +204,7 @@ export function buildNotNullDefaults(ctx, tableSchema, newAttributes, contextAtt
             const attr = newAttributes[idx];
             if (!attr)
                 return;
-            const colType = {
-                typeClass: 'scalar',
-                logicalType: col.logicalType,
-                nullable: !col.notNull,
-                isReadOnly: false,
-            };
+            const colType = columnSchemaToScalarType(col);
             const colKey = col.name.toLowerCase();
             if (!reservedKeys.has(colKey)) {
                 scope.registerSymbol(colKey, (exp, s) => new ColumnReferenceNode(s, exp, colType, attr.id, idx));