@quereus/quereus 4.11.0 → 4.12.1

package/dist/src/schema/rename/self-qualifier-strip.d.ts

@@ -1,14 +1,17 @@
 import type * as AST from '../../parser/ast.js';
 import { type ResolveColumnInSource } from './shared.js';
 /**
- * Strip table-qualified self-references in a CHECK expression down to the
+ * Strip table-qualified self-references in a schema-authored ROW expression —
+ * a `CHECK` constraint or a `GENERATED ALWAYS AS` body — down to the
  * unqualified form: `check (t.qty > 0)` (or `main.t.qty`) becomes
- * `check (qty > 0)` so the constraint planner's row-context scope — which
- * registers bare / `NEW.` / `OLD.` column names only — can resolve it.
+ * `check (qty > 0)` so the row-context scope those expressions are compiled
+ * against — which registers bare / `NEW.` (/ `OLD.` for a CHECK) column names
+ * only — can resolve it. Callers: `planner/building/constraint-builder.ts` and
+ * `planner/building/generated-column-scope.ts`.
  *
- * Deliberately NOT done by seeding `<table>.<col>` keys into the constraint
- * scope: that scope is an ancestor of every subquery planned inside the
- * CHECK, and a join peer's parent-chain fallback (`MultiScope` first-match
+ * Deliberately NOT done by seeding `<table>.<col>` keys into that row scope:
+ * the scope is an ancestor of every subquery planned inside the expression,
+ * and a join peer's parent-chain fallback (`MultiScope` first-match
  * on qualified names) would resolve an inner relation's qualified columns
  * against the outer row context (observed with lens view expansions).
  *
@@ -20,10 +23,13 @@ import { type ResolveColumnInSource } from './shared.js';
  * function / CTE sources are unanalyzable and conservatively block the
  * strip (the ref then stays qualified and fails to resolve exactly as it
  * did before this rewrite existed). CTE and derived-table bodies cannot
- * correlate to the constraint row, so stripping is suppressed inside them.
+ * correlate to the written row, so stripping is suppressed inside them.
+ * The traversal and its frame model live in `../expr-scope/` (`walk.ts` and
+ * `frame.ts`), shared with the generated-column reference collector; this file
+ * supplies only the per-column action.
  *
- * Mutates `expr` in place (callers pass a clone of the stored constraint
- * AST) and returns whether anything was rewritten.
+ * Mutates `expr` in place (callers pass a clone of the stored expression,
+ * never the schema's own AST) and returns whether anything was rewritten.
  */
-export declare function stripSelfQualifierInCheckExpression(expr: AST.AstNode | undefined, tableName: string, defaultSchemaName: string, resolveColumnInSource: ResolveColumnInSource): boolean;
+export declare function stripSelfQualifierInSchemaExpression(expr: AST.AstNode | undefined, tableName: string, defaultSchemaName: string, resolveColumnInSource: ResolveColumnInSource): boolean;
 //# sourceMappingURL=self-qualifier-strip.d.ts.map

package/dist/src/schema/rename/self-qualifier-strip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"self-qualifier-strip.d.ts","sourceRoot":"","sources":["../../../../src/schema/rename/self-qualifier-strip.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAM,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAsC7D;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,mCAAmC,CAClD,IAAI,EAAE,GAAG,CAAC,OAAO,GAAG,SAAS,EAC7B,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,qBAAqB,EAAE,qBAAqB,GAC1C,OAAO,CAkBT"}
+{"version":3,"file":"self-qualifier-strip.d.ts","sourceRoot":"","sources":["../../../../src/schema/rename/self-qualifier-strip.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAM,KAAK,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAiB7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,oCAAoC,CACnD,IAAI,EAAE,GAAG,CAAC,OAAO,GAAG,SAAS,EAC7B,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,MAAM,EACzB,qBAAqB,EAAE,qBAAqB,GAC1C,OAAO,CAcT"}

package/dist/src/schema/rename/self-qualifier-strip.js

@@ -1,13 +1,18 @@
 import { eq } from './shared.js';
+import { hasSealedFrame } from '../expr-scope/frame.js';
+import { walkSchemaExpressionScope } from '../expr-scope/walk.js';
 /**
- * Strip table-qualified self-references in a CHECK expression down to the
+ * Strip table-qualified self-references in a schema-authored ROW expression —
+ * a `CHECK` constraint or a `GENERATED ALWAYS AS` body — down to the
  * unqualified form: `check (t.qty > 0)` (or `main.t.qty`) becomes
- * `check (qty > 0)` so the constraint planner's row-context scope — which
- * registers bare / `NEW.` / `OLD.` column names only — can resolve it.
+ * `check (qty > 0)` so the row-context scope those expressions are compiled
+ * against — which registers bare / `NEW.` (/ `OLD.` for a CHECK) column names
+ * only — can resolve it. Callers: `planner/building/constraint-builder.ts` and
+ * `planner/building/generated-column-scope.ts`.
  *
- * Deliberately NOT done by seeding `<table>.<col>` keys into the constraint
- * scope: that scope is an ancestor of every subquery planned inside the
- * CHECK, and a join peer's parent-chain fallback (`MultiScope` first-match
+ * Deliberately NOT done by seeding `<table>.<col>` keys into that row scope:
+ * the scope is an ancestor of every subquery planned inside the expression,
+ * and a join peer's parent-chain fallback (`MultiScope` first-match
  * on qualified names) would resolve an inner relation's qualified columns
  * against the outer row context (observed with lens view expansions).
  *
@@ -19,240 +24,52 @@ import { eq } from './shared.js';
  * function / CTE sources are unanalyzable and conservatively block the
  * strip (the ref then stays qualified and fails to resolve exactly as it
  * did before this rewrite existed). CTE and derived-table bodies cannot
- * correlate to the constraint row, so stripping is suppressed inside them.
+ * correlate to the written row, so stripping is suppressed inside them.
+ * The traversal and its frame model live in `../expr-scope/` (`walk.ts` and
+ * `frame.ts`), shared with the generated-column reference collector; this file
+ * supplies only the per-column action.
  *
- * Mutates `expr` in place (callers pass a clone of the stored constraint
- * AST) and returns whether anything was rewritten.
+ * Mutates `expr` in place (callers pass a clone of the stored expression,
+ * never the schema's own AST) and returns whether anything was rewritten.
  */
-export function stripSelfQualifierInCheckExpression(expr, tableName, defaultSchemaName, resolveColumnInSource) {
+export function stripSelfQualifierInSchemaExpression(expr, tableName, defaultSchemaName, resolveColumnInSource) {
     if (!expr)
         return false;
     const state = {
         tableName: tableName.toLowerCase(),
         defaultSchema: defaultSchemaName.toLowerCase(),
         resolve: resolveColumnInSource,
-        stack: [],
         changed: false,
     };
-    const seed = emptyStripFrame();
-    seed.bound.add(state.tableName);
-    state.stack.push(seed);
-    try {
-        visitStrip(expr, state);
-    }
-    finally {
-        state.stack.pop();
-    }
+    walkSchemaExpressionScope(expr, { defaultSchema: state.defaultSchema, seedBindings: [state.tableName] }, { onColumn: (col, stack) => stripColumnQualifier(col, stack, state) });
     return state.changed;
 }
-function emptyStripFrame() {
-    return { bound: new Set(), realSources: [], hasOpaque: false, cteNames: new Set() };
-}
-function isStripCteName(state, name) {
-    for (const frame of state.stack) {
-        if (frame.cteNames.has(name))
-            return true;
-    }
-    return false;
-}
-function collectStripBindings(item, state, frame) {
-    switch (item.type) {
-        case 'table': {
-            const ts = item;
-            const name = ts.table.name.toLowerCase();
-            frame.bound.add(ts.alias ? ts.alias.toLowerCase() : name);
-            if (ts.table.schema === undefined && isStripCteName(state, name)) {
-                // CTE source — column set not analyzed.
-                frame.hasOpaque = true;
-            }
-            else {
-                frame.realSources.push({ schema: (ts.table.schema ?? state.defaultSchema).toLowerCase(), name });
-            }
-            break;
-        }
-        case 'join': {
-            const join = item;
-            collectStripBindings(join.left, state, frame);
-            collectStripBindings(join.right, state, frame);
-            break;
-        }
-        case 'subquerySource': {
-            frame.bound.add(item.alias.toLowerCase());
-            frame.hasOpaque = true;
-            break;
-        }
-        case 'functionSource': {
-            const fs = item;
-            if (fs.alias)
-                frame.bound.add(fs.alias.toLowerCase());
-            frame.hasOpaque = true;
-            break;
-        }
-    }
-}
-/** Visit a node in a context where stripping must not occur (CTE / derived-table bodies). */
-function visitStripBarrier(node, state) {
-    const barrier = emptyStripFrame();
-    barrier.hasOpaque = true;
-    state.stack.push(barrier);
-    try {
-        visitStrip(node, state);
-    }
-    finally {
-        state.stack.pop();
-    }
-}
-function visitStrip(node, state) {
-    if (!node)
+/** `stack[0]` is the walk's seed frame; every loop here deliberately skips it. */
+function stripColumnQualifier(col, stack, state) {
+    // View write-through metadata (`with inverse (…)` / `with defaults (…)`) resolves
+    // against the written view row, not this expression's scope — never rewrite there.
+    if (hasSealedFrame(stack))
         return;
-    switch (node.type) {
-        case 'select': {
-            const stmt = node;
-            const withFrame = emptyStripFrame();
-            state.stack.push(withFrame);
-            try {
-                for (const cte of stmt.withClause?.ctes ?? []) {
-                    // A CTE body cannot correlate to the constraint row — no stripping inside.
-                    visitStripBarrier(cte.query, state);
-                    withFrame.cteNames.add(cte.name.toLowerCase());
-                }
-                const frame = buildStripFrame(stmt.from, state);
-                state.stack.push(frame);
-                try {
-                    (stmt.columns ?? []).forEach(c => {
-                        if (c.type === 'column')
-                            visitStrip(c.expr, state);
-                    });
-                    (stmt.from ?? []).forEach(f => visitStrip(f, state));
-                    visitStrip(stmt.where, state);
-                    (stmt.groupBy ?? []).forEach(g => visitStrip(g, state));
-                    visitStrip(stmt.having, state);
-                    (stmt.orderBy ?? []).forEach(o => visitStrip(o.expr, state));
-                    visitStrip(stmt.limit, state);
-                    visitStrip(stmt.offset, state);
-                    visitStrip(stmt.union, state);
-                    if (stmt.compound)
-                        visitStrip(stmt.compound.select, state);
-                }
-                finally {
-                    state.stack.pop();
-                }
-            }
-            finally {
-                state.stack.pop();
-            }
-            break;
-        }
-        case 'values': {
-            node.values.forEach(row => row.forEach(v => visitStrip(v, state)));
-            break;
-        }
-        case 'join': {
-            const join = node;
-            visitStrip(join.left, state);
-            visitStrip(join.right, state);
-            visitStrip(join.condition, state);
-            break;
-        }
-        case 'functionSource': {
-            node.args.forEach(a => visitStrip(a, state));
-            break;
-        }
-        case 'subquerySource': {
-            // A derived table cannot correlate to the constraint row — no stripping inside.
-            visitStripBarrier(node.subquery, state);
-            break;
-        }
-        case 'binary': {
-            const e = node;
-            visitStrip(e.left, state);
-            visitStrip(e.right, state);
-            break;
-        }
-        case 'unary':
-        case 'cast':
-        case 'collate':
-            visitStrip(node.expr, state);
-            break;
-        case 'function':
-            node.args.forEach(a => visitStrip(a, state));
-            break;
-        case 'subquery':
-            visitStrip(node.query, state);
-            break;
-        case 'windowFunction': {
-            const wf = node;
-            visitStrip(wf.function, state);
-            visitStrip(wf.window, state);
-            break;
-        }
-        case 'windowDefinition': {
-            const wd = node;
-            (wd.partitionBy ?? []).forEach(p => visitStrip(p, state));
-            (wd.orderBy ?? []).forEach(o => visitStrip(o.expr, state));
-            break;
-        }
-        case 'case': {
-            const ce = node;
-            visitStrip(ce.baseExpr, state);
-            ce.whenThenClauses.forEach(wt => {
-                visitStrip(wt.when, state);
-                visitStrip(wt.then, state);
-            });
-            visitStrip(ce.elseExpr, state);
-            break;
-        }
-        case 'in': {
-            const ie = node;
-            visitStrip(ie.expr, state);
-            (ie.values ?? []).forEach(v => visitStrip(v, state));
-            visitStrip(ie.subquery, state);
-            break;
-        }
-        case 'exists':
-            visitStrip(node.subquery, state);
-            break;
-        case 'between': {
-            const be = node;
-            visitStrip(be.expr, state);
-            visitStrip(be.lower, state);
-            visitStrip(be.upper, state);
-            break;
-        }
-        case 'column': {
-            stripColumnQualifier(node, state);
-            break;
-        }
-        default:
-            break;
-    }
-}
-function buildStripFrame(from, state) {
-    const frame = emptyStripFrame();
-    (from ?? []).forEach(item => collectStripBindings(item, state, frame));
-    return frame;
-}
-function stripColumnQualifier(col, state) {
     if (!col.table)
         return;
     const qualifier = col.table.toLowerCase();
     // Innermost-first: a qualifier rebound by any inner FROM resolves there.
-    for (let i = state.stack.length - 1; i >= 1; i--) {
-        if (state.stack[i].bound.has(qualifier))
+    for (let i = stack.length - 1; i >= 1; i--) {
+        if (stack[i].bound.has(qualifier))
             return;
     }
     if (qualifier !== state.tableName)
         return;
     // A qualified self-reference must name the OWNING table's schema exactly —
-    // `defaultSchema` here is the CHECK's owning schema (the caller passes
+    // `defaultSchema` here is the expression's owning schema (the caller passes
     // `tableSchema.schemaName`), so no path resolution applies: `main.t.qty` in
-    // a CHECK on `temp.t` is not a self-reference.
+    // an expression on `temp.t` is not a self-reference.
     if (!(col.schema === undefined || eq(col.schema, state.defaultSchema)))
         return;
     // Strip only when no intervening frame could capture the unqualified name.
     const colLower = col.name.toLowerCase();
-    for (let i = 1; i < state.stack.length; i++) {
-        const frame = state.stack[i];
+    for (let i = 1; i < stack.length; i++) {
+        const frame = stack[i];
         if (frame.hasOpaque)
             return;
         for (const src of frame.realSources) {

package/dist/src/schema/rename/self-qualifier-strip.js.map

@@ -1 +1 @@
-{"version":3,"file":"self-qualifier-strip.js","sourceRoot":"","sources":["../../../../src/schema/rename/self-qualifier-strip.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"self-qualifier-strip.js","sourceRoot":"","sources":["../../../../src/schema/rename/self-qualifier-strip.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAA8B,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAmB,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAelE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,UAAU,oCAAoC,CACnD,IAA6B,EAC7B,SAAiB,EACjB,iBAAyB,EACzB,qBAA4C;IAE5C,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACxB,MAAM,KAAK,GAAe;QACzB,SAAS,EAAE,SAAS,CAAC,WAAW,EAAE;QAClC,aAAa,EAAE,iBAAiB,CAAC,WAAW,EAAE;QAC9C,OAAO,EAAE,qBAAqB;QAC9B,OAAO,EAAE,KAAK;KACd,CAAC;IACF,yBAAyB,CACxB,IAAI,EACJ,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,EACvE,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CACrE,CAAC;IACF,OAAO,KAAK,CAAC,OAAO,CAAC;AACtB,CAAC;AAED,kFAAkF;AAClF,SAAS,oBAAoB,CAC5B,GAAmB,EACnB,KAAgC,EAChC,KAAiB;IAEjB,kFAAkF;IAClF,mFAAmF;IACnF,IAAI,cAAc,CAAC,KAAK,CAAC;QAAE,OAAO;IAClC,IAAI,CAAC,GAAG,CAAC,KAAK;QAAE,OAAO;IACvB,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;IAC1C,yEAAyE;IACzE,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5C,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC;YAAE,OAAO;IAC3C,CAAC;IACD,IAAI,SAAS,KAAK,KAAK,CAAC,SAAS;QAAE,OAAO;IAC1C,2EAA2E;IAC3E,4EAA4E;IAC5E,4EAA4E;IAC5E,qDAAqD;IACrD,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;QAAE,OAAO;IAC/E,2EAA2E;IAC3E,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,IAAI,KAAK,CAAC,SAAS;YAAE,OAAO;QAC5B,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACrC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC;gBAAE,OAAO;QAC3D,CAAC;IACF,CAAC;IACD,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC;IACtB,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC;IACvB,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;AACtB,CAAC"}

package/dist/src/schema/rename-rewriter.d.ts

@@ -2,8 +2,9 @@
  * In-place, scope-aware AST rewriters over schema-object expressions: the
  * rename walkers propagate ALTER TABLE RENAME operations into dependent
  * objects (CHECK expressions, view SELECT bodies, etc.), and the
- * self-qualifier strip folds a CHECK's table-qualified self-references so
- * the constraint planner's row-context scope can resolve them.
+ * self-qualifier strip folds a schema-authored row expression's
+ * table-qualified self-references (a CHECK's or a GENERATED ALWAYS AS body's)
+ * so the row-context scope it is compiled against can resolve them.
  *
  * The three walkers live in `rename/`, split along their seams — table
  * rename (`rename/table-rename.ts`), column rename
@@ -16,5 +17,5 @@ export type { ResolveColumnInSource, ResolveObjectRef, RowImageContext, TableRen
 export { objectRefKey, objectRefKeySchema, singleSchemaObjectRefResolver } from './rename/shared.js';
 export { renameTableInAst, tableReferencedInAst, collectTableRefsInAst, renameTableInIndexPredicates, renameTableInCheckConstraints, renameTableInColumnExpressions, type TableRenameOpts, } from './rename/table-rename.js';
 export { PROBE_COLUMN_NAME, renameColumnInAst, renameColumnInCheckExpression, columnReferencedInAst, columnReferencedInCheckExpression, renameColumnInIndexPredicates, renameColumnInCheckConstraints, renameColumnInColumnExpressions, bodyExposesRenamedColumn, bodyPublishesColumnNamed, } from './rename/column-rename.js';
-export { stripSelfQualifierInCheckExpression } from './rename/self-qualifier-strip.js';
+export { stripSelfQualifierInSchemaExpression } from './rename/self-qualifier-strip.js';
 //# sourceMappingURL=rename-rewriter.d.ts.map

package/dist/src/schema/rename-rewriter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rename-rewriter.d.ts","sourceRoot":"","sources":["../../../src/schema/rename-rewriter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,YAAY,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACtH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EACN,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,4BAA4B,EAC5B,6BAA6B,EAC7B,8BAA8B,EAC9B,KAAK,eAAe,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACN,iBAAiB,EACjB,iBAAiB,EACjB,6BAA6B,EAC7B,qBAAqB,EACrB,iCAAiC,EACjC,6BAA6B,EAC7B,8BAA8B,EAC9B,+BAA+B,EAC/B,wBAAwB,EACxB,wBAAwB,GACxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mCAAmC,EAAE,MAAM,kCAAkC,CAAC"}
+{"version":3,"file":"rename-rewriter.d.ts","sourceRoot":"","sources":["../../../src/schema/rename-rewriter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,YAAY,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACtH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EACN,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,4BAA4B,EAC5B,6BAA6B,EAC7B,8BAA8B,EAC9B,KAAK,eAAe,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACN,iBAAiB,EACjB,iBAAiB,EACjB,6BAA6B,EAC7B,qBAAqB,EACrB,iCAAiC,EACjC,6BAA6B,EAC7B,8BAA8B,EAC9B,+BAA+B,EAC/B,wBAAwB,EACxB,wBAAwB,GACxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,oCAAoC,EAAE,MAAM,kCAAkC,CAAC"}

package/dist/src/schema/rename-rewriter.js

@@ -2,8 +2,9 @@
  * In-place, scope-aware AST rewriters over schema-object expressions: the
  * rename walkers propagate ALTER TABLE RENAME operations into dependent
  * objects (CHECK expressions, view SELECT bodies, etc.), and the
- * self-qualifier strip folds a CHECK's table-qualified self-references so
- * the constraint planner's row-context scope can resolve them.
+ * self-qualifier strip folds a schema-authored row expression's
+ * table-qualified self-references (a CHECK's or a GENERATED ALWAYS AS body's)
+ * so the row-context scope it is compiled against can resolve them.
  *
  * The three walkers live in `rename/`, split along their seams — table
  * rename (`rename/table-rename.ts`), column rename
@@ -15,5 +16,5 @@
 export { objectRefKey, objectRefKeySchema, singleSchemaObjectRefResolver } from './rename/shared.js';
 export { renameTableInAst, tableReferencedInAst, collectTableRefsInAst, renameTableInIndexPredicates, renameTableInCheckConstraints, renameTableInColumnExpressions, } from './rename/table-rename.js';
 export { PROBE_COLUMN_NAME, renameColumnInAst, renameColumnInCheckExpression, columnReferencedInAst, columnReferencedInCheckExpression, renameColumnInIndexPredicates, renameColumnInCheckConstraints, renameColumnInColumnExpressions, bodyExposesRenamedColumn, bodyPublishesColumnNamed, } from './rename/column-rename.js';
-export { stripSelfQualifierInCheckExpression } from './rename/self-qualifier-strip.js';
+export { stripSelfQualifierInSchemaExpression } from './rename/self-qualifier-strip.js';
 //# sourceMappingURL=rename-rewriter.js.map

package/dist/src/schema/rename-rewriter.js.map

@@ -1 +1 @@
-{"version":3,"file":"rename-rewriter.js","sourceRoot":"","sources":["../../../src/schema/rename-rewriter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EACN,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,4BAA4B,EAC5B,6BAA6B,EAC7B,8BAA8B,GAE9B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACN,iBAAiB,EACjB,iBAAiB,EACjB,6BAA6B,EAC7B,qBAAqB,EACrB,iCAAiC,EACjC,6BAA6B,EAC7B,8BAA8B,EAC9B,+BAA+B,EAC/B,wBAAwB,EACxB,wBAAwB,GACxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mCAAmC,EAAE,MAAM,kCAAkC,CAAC"}
+{"version":3,"file":"rename-rewriter.js","sourceRoot":"","sources":["../../../src/schema/rename-rewriter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EACN,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,4BAA4B,EAC5B,6BAA6B,EAC7B,8BAA8B,GAE9B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACN,iBAAiB,EACjB,iBAAiB,EACjB,6BAA6B,EAC7B,qBAAqB,EACrB,iCAAiC,EACjC,6BAA6B,EAC7B,8BAA8B,EAC9B,+BAA+B,EAC/B,wBAAwB,EACxB,wBAAwB,GACxB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,oCAAoC,EAAE,MAAM,kCAAkC,CAAC"}

package/dist/src/schema/schema-differ.d.ts

@@ -12,11 +12,30 @@ export interface ColumnRenameOp {
     oldName: string;
     newName: string;
 }
+/**
+ * A create-bucket entry: the DDL text (what `diff schema` shows and what an error
+ * names) paired with the AST it was rendered from, so `apply schema` can execute
+ * the statement without re-lexing the text it just produced.
+ */
+export interface MigrationCreate {
+    readonly sql: string;
+    readonly ast: AST.Statement;
+}
+/**
+ * One statement of a migration. `sql` is always present — it is the preview text
+ * and the text an error names. `ast` is present when the step was built from a
+ * statement AST rather than a template string; the apply path executes it directly
+ * and falls back to parsing `sql` when it is absent.
+ */
+export interface MigrationStep {
+    readonly sql: string;
+    readonly ast?: AST.Statement;
+}
 /**
  * Represents the difference between a declared schema and actual database state
  */
 export interface SchemaDiff {
-    tablesToCreate: string[];
+    tablesToCreate: MigrationCreate[];
     tablesToDrop: string[];
     tablesToAlter: TableAlterDiff[];
     /**
@@ -35,11 +54,11 @@ export interface SchemaDiff {
         fromModule: string;
         toModule: string;
     }>;
-    viewsToCreate: string[];
+    viewsToCreate: MigrationCreate[];
     viewsToDrop: string[];
-    indexesToCreate: string[];
+    indexesToCreate: MigrationCreate[];
     indexesToDrop: string[];
-    assertionsToCreate: string[];
+    assertionsToCreate: MigrationCreate[];
     assertionsToDrop: string[];
     /**
      * In-place metadata-tag changes on name-matched views / indexes (whole-set
@@ -91,6 +110,14 @@ export interface ColumnAttributeChange {
      * treated as equal (no spurious diff). Emitted as `SET COLLATE <name>`.
      */
     collation?: string;
+    /**
+     * Set only when a retype (`dataType`) and a DEFAULT change (`defaultValue`) land on the
+     * same column AND the column currently has a DEFAULT. `SET DATA TYPE` folds the column's
+     * EXISTING default against the new type and rejects one that cannot convert, so the
+     * outgoing default — which this migration replaces anyway — must be dropped first or it
+     * vetoes the retype (`text default 'abc'` → `integer default 0`).
+     */
+    dropStaleDefaultFirst?: true;
     /**
      * Desired metadata tag set (whole-set replacement) when the declared column
      * tags differ from actual. Omitted = no change; `{}` = clear all tags. Rename
@@ -235,11 +262,32 @@ export declare function applyViewSchemaDefault<T extends AST.CreateViewStmt | AS
  */
 export declare function applyAssertionSchemaDefault(stmt: AST.CreateAssertionStmt, targetSchemaName: string | undefined): AST.CreateAssertionStmt;
 /**
- * Serializes a schema diff to JSON string
+ * Serializes a schema diff to JSON string.
+ *
+ * NOTE: the four create buckets serialize as `{ sql, ast }` objects (see
+ * {@link MigrationCreate}), so the output embeds a full statement AST per create
+ * and is far more verbose than the old bare-string form. No caller in the repo
+ * consumes this today; a caller that only wants the DDL should read `.sql` (or
+ * call {@link generateMigrationDDL}) rather than this whole-diff dump.
  */
 export declare function serializeSchemaDiff(diff: SchemaDiff): string;
 /**
- * Generates migration DDL statements from a schema diff
+ * Generates migration DDL statements from a schema diff.
+ *
+ * Thin wrapper over {@link generateMigrationPlan} — the single ordering authority.
+ * `diff schema` previews exactly this text, and `apply schema` executes the plan
+ * these strings come from, so the two can never disagree.
  */
 export declare function generateMigrationDDL(diff: SchemaDiff, schemaName?: string): string[];
+/**
+ * Builds the ordered migration plan for a schema diff.
+ *
+ * Every step carries its `sql` (the preview text, and the text an execution error
+ * names). Steps built from a statement AST — the four create buckets and the
+ * `set maintained as` re-attach — also carry that AST, so `apply schema` can run
+ * them without re-lexing the text this function just produced. The remaining steps
+ * are short template-built strings (renames, drops, column/constraint alters,
+ * `SET TAGS`) and stay text-only.
+ */
+export declare function generateMigrationPlan(diff: SchemaDiff, schemaName?: string): MigrationStep[];
 //# sourceMappingURL=schema-differ.d.ts.map

package/dist/src/schema/schema-differ.d.ts.map

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