@pgpmjs/transform 0.19.0 → 0.20.0

package/constraint-names.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Postgres default constraint names.
+ *
+ * When a constraint is authored without a name, Postgres derives one at
+ * deploy time (`ChooseConstraintName` in the server): `{table}_pkey` for
+ * primary keys, `{table}_{cols}_key` for unique constraints,
+ * `{table}_{col}_fkey` for foreign keys, `{table}_{col}_check` (first
+ * referenced column) or `{table}_check` for check constraints. Synthesizing
+ * the same names makes unnamed authorship comparable to (and revertible as)
+ * what the catalog will actually contain.
+ */
+/** A parsed `Constraint` node (structural — the fields this module reads). */
+export interface ConstraintNode {
+    contype?: string;
+    conname?: string;
+    keys?: {
+        String?: {
+            sval?: string;
+        };
+    }[];
+    fk_attrs?: {
+        String?: {
+            sval?: string;
+        };
+    }[];
+    raw_expr?: unknown;
+}
+/** First `ColumnRef` column name reached in an expression tree, DFS order. */
+export declare function firstColumnRef(node: unknown): string | null;
+/**
+ * The name Postgres would assign to an unnamed constraint on `table`, given
+ * the constraint node and (for column-attached constraints) the owning
+ * column. Returns `null` for kinds without a stable derivation (exclusion
+ * constraints and anything unrecognized).
+ */
+export declare function defaultConstraintName(table: string, constraint: ConstraintNode, column?: string): string | null;

package/constraint-names.js

@@ -0,0 +1,75 @@
+"use strict";
+/**
+ * Postgres default constraint names.
+ *
+ * When a constraint is authored without a name, Postgres derives one at
+ * deploy time (`ChooseConstraintName` in the server): `{table}_pkey` for
+ * primary keys, `{table}_{cols}_key` for unique constraints,
+ * `{table}_{col}_fkey` for foreign keys, `{table}_{col}_check` (first
+ * referenced column) or `{table}_check` for check constraints. Synthesizing
+ * the same names makes unnamed authorship comparable to (and revertible as)
+ * what the catalog will actually contain.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.firstColumnRef = firstColumnRef;
+exports.defaultConstraintName = defaultConstraintName;
+const svals = (items) => (items ?? []).map(k => k.String?.sval).filter((s) => typeof s === 'string');
+/** First `ColumnRef` column name reached in an expression tree, DFS order. */
+function firstColumnRef(node) {
+    if (Array.isArray(node)) {
+        for (const item of node) {
+            const found = firstColumnRef(item);
+            if (found)
+                return found;
+        }
+        return null;
+    }
+    if (node && typeof node === 'object') {
+        const record = node;
+        const ref = record.ColumnRef;
+        if (ref?.fields) {
+            const names = svals(ref.fields);
+            if (names.length > 0)
+                return names[names.length - 1];
+        }
+        for (const value of Object.values(record)) {
+            const found = firstColumnRef(value);
+            if (found)
+                return found;
+        }
+    }
+    return null;
+}
+/**
+ * The name Postgres would assign to an unnamed constraint on `table`, given
+ * the constraint node and (for column-attached constraints) the owning
+ * column. Returns `null` for kinds without a stable derivation (exclusion
+ * constraints and anything unrecognized).
+ */
+function defaultConstraintName(table, constraint, column) {
+    const cols = () => {
+        const keyed = svals(constraint.keys);
+        if (keyed.length > 0)
+            return keyed;
+        return column ? [column] : [];
+    };
+    switch (constraint.contype) {
+        case 'CONSTR_PRIMARY':
+            return `${table}_pkey`;
+        case 'CONSTR_UNIQUE': {
+            const names = cols();
+            return names.length > 0 ? `${table}_${names.join('_')}_key` : null;
+        }
+        case 'CONSTR_FOREIGN': {
+            const attrs = svals(constraint.fk_attrs);
+            const names = attrs.length > 0 ? attrs : column ? [column] : [];
+            return names.length > 0 ? `${table}_${names.join('_')}_fkey` : null;
+        }
+        case 'CONSTR_CHECK': {
+            const col = column ?? firstColumnRef(constraint.raw_expr);
+            return col ? `${table}_${col}_check` : `${table}_check`;
+        }
+        default:
+            return null;
+    }
+}

package/esm/constraint-names.js

@@ -0,0 +1,71 @@
+/**
+ * Postgres default constraint names.
+ *
+ * When a constraint is authored without a name, Postgres derives one at
+ * deploy time (`ChooseConstraintName` in the server): `{table}_pkey` for
+ * primary keys, `{table}_{cols}_key` for unique constraints,
+ * `{table}_{col}_fkey` for foreign keys, `{table}_{col}_check` (first
+ * referenced column) or `{table}_check` for check constraints. Synthesizing
+ * the same names makes unnamed authorship comparable to (and revertible as)
+ * what the catalog will actually contain.
+ */
+const svals = (items) => (items ?? []).map(k => k.String?.sval).filter((s) => typeof s === 'string');
+/** First `ColumnRef` column name reached in an expression tree, DFS order. */
+export function firstColumnRef(node) {
+    if (Array.isArray(node)) {
+        for (const item of node) {
+            const found = firstColumnRef(item);
+            if (found)
+                return found;
+        }
+        return null;
+    }
+    if (node && typeof node === 'object') {
+        const record = node;
+        const ref = record.ColumnRef;
+        if (ref?.fields) {
+            const names = svals(ref.fields);
+            if (names.length > 0)
+                return names[names.length - 1];
+        }
+        for (const value of Object.values(record)) {
+            const found = firstColumnRef(value);
+            if (found)
+                return found;
+        }
+    }
+    return null;
+}
+/**
+ * The name Postgres would assign to an unnamed constraint on `table`, given
+ * the constraint node and (for column-attached constraints) the owning
+ * column. Returns `null` for kinds without a stable derivation (exclusion
+ * constraints and anything unrecognized).
+ */
+export function defaultConstraintName(table, constraint, column) {
+    const cols = () => {
+        const keyed = svals(constraint.keys);
+        if (keyed.length > 0)
+            return keyed;
+        return column ? [column] : [];
+    };
+    switch (constraint.contype) {
+        case 'CONSTR_PRIMARY':
+            return `${table}_pkey`;
+        case 'CONSTR_UNIQUE': {
+            const names = cols();
+            return names.length > 0 ? `${table}_${names.join('_')}_key` : null;
+        }
+        case 'CONSTR_FOREIGN': {
+            const attrs = svals(constraint.fk_attrs);
+            const names = attrs.length > 0 ? attrs : column ? [column] : [];
+            return names.length > 0 ? `${table}_${names.join('_')}_fkey` : null;
+        }
+        case 'CONSTR_CHECK': {
+            const col = column ?? firstColumnRef(constraint.raw_expr);
+            return col ? `${table}_${col}_check` : `${table}_check`;
+        }
+        default:
+            return null;
+    }
+}

package/esm/granularity-driver.js

@@ -1,25 +1,9 @@
-/**
- * Granularity driver: restructure a pgpm module's deploy surface between the
- * atomic, object, and consolidated shapes.
- *
- * The upstream pass (`restructureSql` in `@pgsql/transform`) rewrites one SQL
- * script between equivalent shapes, guarded by the statement dependency
- * graph. This driver lifts that to the pgpm change model: it flattens a
- * module's deploy scripts in plan order into one program, restructures it to
- * the target granularity, then re-slices the result into changes — one change
- * per created object — with change dependencies recomputed from the statement
- * graph. Like the other drivers in this package it is structurally typed on
- * the bundle seams: no dependency on `@pgpmjs/bundle` or `@pgpmjs/core`.
- *
- * - `atomic`       — the machine-emitted shape: bare CREATE TABLE plus one
- *                    ALTER per column/constraint.
- * - `object`       — each table fully baked; cross-object statements
- *                    (FKs, indexes, triggers, policies) stay separate.
- * - `consolidated` — additionally inlines FKs proven safe by the graph.
- */
 import { pathFor } from '@pgpmjs/naming-spec';
 import { revertFor, verifyFor } from '@pgsql/scripts';
 import { buildStatementGraph, classifyStatements, identityOf, restructureSql } from '@pgsql/transform';
+import { nameUnnamedConstraints, subObjectIdentityOf } from './sub-object';
+export const CHANGE_GRANULARITIES = ['alteration', 'object', 'single'];
+export const isChangeGranularity = (value) => CHANGE_GRANULARITIES.includes(value);
 const KIND_DIRS = {
     table: 'tables',
     view: 'views',
@@ -53,22 +37,50 @@ export function defaultChangeName(facts) {
  */
 export function restructureChanges(changes, options) {
     const nameFor = options.changeName ?? defaultChangeName;
+    const subNameFor = options.subObjectName ?? ((identity) => pathFor(identity));
+    const alteration = options.changeGranularity === 'alteration';
     const flattened = changes
         .map(c => c.deploy.trim())
         .filter(Boolean)
         .join('\n\n');
-    const { sql, warnings } = restructureSql(flattened, {
+    const restructured = restructureSql(flattened, {
         granularity: options.granularity
     });
+    const warnings = restructured.warnings;
+    const sql = alteration ? nameUnnamedConstraints(restructured.sql) : restructured.sql;
     // Re-classify the emitted script; group statements by the object they
     // target (creates[0]), so a table's CREATE and its remaining ALTERs land
     // in the same change regardless of statement kind.
     const facts = classifyStatements(sql);
+    if (options.changeGranularity === 'single') {
+        const name = options.singleChangeName ?? 'module/init';
+        const inputNames = new Set(changes.map(c => c.name));
+        const dependencies = [...new Set(changes.flatMap(c => c.dependencies).filter(d => !inputNames.has(d)))].sort();
+        const statements = facts
+            .map(f => sql.slice(f.span.start, f.span.start + f.span.len).trim())
+            .filter(Boolean)
+            .map(text => (text.endsWith(';') ? text : `${text};`));
+        const revert = revertFor(facts);
+        const verify = verifyFor(facts);
+        for (const warning of [...revert.warnings, ...verify.warnings]) {
+            warnings.push(`${name}: ${warning}`);
+        }
+        return {
+            changes: statements.length > 0
+                ? [{ name, dependencies, deploy: statements.join('\n\n'), revert: revert.sql, verify: verify.sql }]
+                : [],
+            warnings
+        };
+    }
     const graph = buildStatementGraph(facts);
     const groupOf = new Array(facts.length).fill(-1);
     const groupKeys = [];
     const groupFacts = [];
     const groupKeyToIndex = new Map();
+    /** Sub-object path for alteration groups; null means name via `nameFor`. */
+    const groupSubName = [];
+    /** For alteration groups: the object-group key of the owning table. */
+    const groupOwnerKey = [];
     facts.forEach((f, i) => {
         const created = f.creates[0];
         if (!created) {
@@ -78,12 +90,31 @@ export function restructureChanges(changes, options) {
                 groupOf[i] = groupOf[i - 1];
             return;
         }
+        if (alteration) {
+            const sub = subObjectIdentityOf(f);
+            if (sub) {
+                const key = `sub\u0000${sub.kind}\u0000${sub.schema ?? ''}\u0000${sub.table}\u0000${sub.name}`;
+                let g = groupKeyToIndex.get(key);
+                if (g === undefined) {
+                    g = groupKeys.length;
+                    groupKeys.push(key);
+                    groupFacts.push(f);
+                    groupSubName.push(subNameFor(sub));
+                    groupOwnerKey.push(`${sub.schema ?? ''}.${sub.table}`);
+                    groupKeyToIndex.set(key, g);
+                }
+                groupOf[i] = g;
+                return;
+            }
+        }
         const key = `${created.schema ?? ''}.${created.name}`;
         let g = groupKeyToIndex.get(key);
         if (g === undefined) {
             g = groupKeys.length;
             groupKeys.push(key);
             groupFacts.push(f);
+            groupSubName.push(null);
+            groupOwnerKey.push(null);
             groupKeyToIndex.set(key, g);
         }
         else if (!(groupFacts[g].kind in KIND_DIRS) && groupFacts[g].kind !== 'schema' && (f.kind in KIND_DIRS || f.kind === 'schema')) {
@@ -92,7 +123,7 @@ export function restructureChanges(changes, options) {
         }
         groupOf[i] = g;
     });
-    const groupNames = groupFacts.map(nameFor);
+    const groupNames = groupFacts.map((f, g) => groupSubName[g] ?? nameFor(f));
     // Schema producers, for schema-level change dependencies.
     const schemaGroup = new Map();
     facts.forEach((f, i) => {
@@ -138,6 +169,38 @@ export function restructureChanges(changes, options) {
                 groupDeps[from].add(to);
         }
     });
+    // Alteration groups depend on their table's own change, and constraint
+    // groups additionally on the column changes they key on — the statement
+    // graph keys everything by the table, so these finer edges are added here.
+    if (alteration) {
+        const columnGroup = new Map();
+        groupKeys.forEach((key, g) => {
+            const parts = key.split('\u0000');
+            if (parts[0] === 'sub' && parts[1] === 'column') {
+                columnGroup.set(`${parts[2]}.${parts[3]}.${parts[4]}`, g);
+            }
+        });
+        groupKeys.forEach((key, g) => {
+            const owner = groupOwnerKey[g];
+            if (owner === null)
+                return;
+            const tableGroup = groupKeyToIndex.get(owner);
+            if (tableGroup !== undefined && tableGroup !== g)
+                groupDeps[g].add(tableGroup);
+            const parts = key.split('\u0000');
+            if (parts[1] !== 'constraint')
+                return;
+            const constraint = groupFacts[g].stmt?.AlterTableStmt?.cmds?.[0]?.AlterTableCmd?.def?.Constraint;
+            const referenced = [...(constraint?.keys ?? []), ...(constraint?.fk_attrs ?? [])]
+                .map(k => k.String?.sval)
+                .filter((s) => typeof s === 'string');
+            for (const col of referenced) {
+                const to = columnGroup.get(`${owner}.${col}`);
+                if (to !== undefined && to !== g)
+                    groupDeps[g].add(to);
+            }
+        });
+    }
     // Emit groups in first-statement order (already topological).
     const order = [...groupNames.keys()].sort((a, b) => {
         const firstA = groupOf.indexOf(a);

package/esm/index.js

@@ -1,9 +1,10 @@
 export { buildExtensionRouter, buildSchemaRouter, makeNamespaceValidator, makeSchemaTranspiler, } from './bundle-driver';
 export { diffCatalogSnapshots, snapshotCatalog, withoutColumnOrder } from './catalog-check';
 export { buildCategoryOf, categorizeChange, TIER_PROFILE, } from './categorize';
+export { defaultConstraintName, firstColumnRef } from './constraint-names';
 export { resolveFixtureClosure } from './fixture-closure';
-export { defaultChangeName, restructureChanges, } from './granularity-driver';
-export { checkOverwrite, writeControlFile, writeModule } from './module-emit';
+export { CHANGE_GRANULARITIES, defaultChangeName, isChangeGranularity, restructureChanges, } from './granularity-driver';
+export { appendModule, checkOverwrite, writeControlFile, writeModule } from './module-emit';
 export { loadModuleSource, stripTransactionWrapper } from './module-source';
 export { parsePartitionConfig, partitionExportRows } from './partition';
 export { PartitionCycleError, partitionUnits, RESIDUAL_UNIT_PATH, } from './partition-driver';
@@ -11,5 +12,6 @@ export { emitSqlProgram, parseSqlProgram } from './program';
 export { classifyScript, isStubScript, regenerateScripts, } from './regen';
 export { EXPORT_GRANULARITIES, isExportGranularity, restructureExportRows } from './restructure';
 export { diffChangeSets, diffSchemas, } from './semantic-diff-driver';
+export { nameUnnamedConstraints, subObjectIdentityOf } from './sub-object';
 export * from '@pgsql/transform';
 export { loadModule } from 'plpgsql-parser';

package/esm/module-emit.js

@@ -9,7 +9,7 @@
  * `pgpm import` all emit byte-identical module layouts instead of each
  * carrying its own copy of the writer.
  */
-import { writePgpmFiles, writePgpmPlan } from '@pgpmjs/ast';
+import { parseAuthor, parsePlanFile, writePgpmFiles, writePgpmPlan, writePlanFile } from '@pgpmjs/ast';
 import * as fs from 'fs';
 import * as path from 'path';
 /** Write a module's Postgres extension `.control` file. */
@@ -48,6 +48,76 @@ export const writeModule = (outBase, model, extraRequires = []) => {
     writePgpmFiles(model.rows, opts);
     return dir;
 };
+/**
+ * Append plan-ordered {@link PgpmRow}s into an *existing* module rather than
+ * writing a fresh package. Existing changes, their scripts, and the `.control`
+ * file are left untouched; only the new changes are written (deploy/revert/
+ * verify) and appended to `pgpm.plan` after the current changes.
+ *
+ * Rows whose change name already exists are skipped (never overwritten).
+ * A new change's dependency bracket is filtered to names that resolve within
+ * the plan (existing changes, other appended changes, or `pkg:`-external
+ * references); a dangling internal dependency is dropped with a warning
+ * (plan order still sequences it after the current changes).
+ */
+export const appendModule = (moduleDir, rows, options = {}) => {
+    const planPath = path.join(moduleDir, 'pgpm.plan');
+    if (!fs.existsSync(planPath)) {
+        throw new Error(`No pgpm.plan found at ${planPath}; append mode expects an existing pgpm module directory.`);
+    }
+    const parsed = parsePlanFile(planPath);
+    if (!parsed.data) {
+        throw new Error(`Failed to parse ${planPath}: ${parsed.errors
+            .map(e => `line ${e.line}: ${e.message}`)
+            .join('; ')}`);
+    }
+    const plan = parsed.data;
+    const existingNames = new Set(plan.changes.map(c => c.name));
+    const incomingNames = new Set(rows.map(r => r.deploy));
+    const appended = new Set();
+    const added = [];
+    const skipped = [];
+    const warnings = [];
+    const newRows = [];
+    const { fullName, email } = parseAuthor(options.author || 'constructive');
+    const timestamp = new Date().toISOString().replace(/\.\d{3}Z$/, 'Z');
+    for (const row of rows) {
+        if (existingNames.has(row.deploy) || appended.has(row.deploy)) {
+            skipped.push(row.deploy);
+            warnings.push(`change ${row.deploy} already exists in ${plan.package}; left untouched`);
+            continue;
+        }
+        const deps = (row.deps ?? []).filter(dep => {
+            if (dep.includes(':'))
+                return true; // cross-package (pkg:change) external
+            if (existingNames.has(dep) || incomingNames.has(dep))
+                return true;
+            warnings.push(`change ${row.deploy}: dropped dependency ${dep} (not present in ${plan.package})`);
+            return false;
+        });
+        plan.changes.push({
+            name: row.deploy,
+            dependencies: deps,
+            timestamp,
+            planner: fullName,
+            email: email || `${fullName}@constructive.io`,
+            comment: `add ${row.name ?? row.deploy}`
+        });
+        newRows.push({ ...row, deps });
+        appended.add(row.deploy);
+        added.push(row.deploy);
+    }
+    if (newRows.length) {
+        const opts = {
+            outdir: path.dirname(moduleDir),
+            name: path.basename(moduleDir),
+            replacer: (str) => str
+        };
+        writePgpmFiles(newRows, opts);
+        writePlanFile(planPath, plan);
+    }
+    return { dir: moduleDir, added, skipped, warnings };
+};
 /**
  * Guard against clobbering: writing into the source directory requires
  * `--write`, as does overwriting any existing package directory.

package/esm/restructure.js

@@ -33,7 +33,12 @@ export const restructureExportRows = async (rows, granularity, options = {}) =>
         name: row.deploy,
         dependencies: row.deps ?? [],
         deploy: row.content
-    })), { granularity, changeName });
+    })), {
+        granularity,
+        changeGranularity: options.changeGranularity,
+        changeName,
+        subObjectName: identity => pathFor(identity, { style })
+    });
     const counters = new Map();
     const taken = new Set();
     const restructured = changes.map(change => {

package/esm/semantic-diff-driver.js

@@ -30,6 +30,7 @@ import { pathFor } from '@pgpmjs/naming-spec';
 import { existenceCheck, invertStatement, revertFor, verifyFor } from '@pgsql/scripts';
 import { buildStatementGraph, classifyStatements, cleanTree, identityOf } from '@pgsql/transform';
 import { Deparser, parseSync } from 'plpgsql-parser';
+import { defaultConstraintName } from './constraint-names';
 import { restructureChanges } from './granularity-driver';
 const identityKey = (id) => `${id.kind}\u0000${id.schema ?? ''}\u0000${id.table ?? ''}\u0000${id.name}`;
 /**
@@ -99,7 +100,7 @@ function groupingIdentity(f) {
     const identity = identityOf(f);
     if (!identity)
         return null;
-    if ((f.kind === 'table' || f.kind === 'constraint' || f.kind === 'rls_enable') &&
+    if ((f.kind === 'table' || f.kind === 'constraint' || f.kind === 'fk_constraint' || f.kind === 'rls_enable') &&
         identity.kind !== 'table') {
         return { kind: 'table', schema: identity.schema, name: identity.table ?? identity.name };
     }
@@ -112,21 +113,61 @@ function fingerprint(text) {
 }
 /** Multiset fingerprint of a whole unit. */
 const unitFingerprint = (unit) => unit.texts.map(fingerprint).sort().join('\n');
+/** JSON with recursively sorted object keys — an insertion-order-proof fingerprint. */
+function stablePrint(node) {
+    if (Array.isArray(node))
+        return `[${node.map(stablePrint).join(',')}]`;
+    if (node && typeof node === 'object') {
+        const entries = Object.entries(node)
+            .filter(([, v]) => v !== undefined)
+            .sort(([a], [b]) => a.localeCompare(b))
+            .map(([k, v]) => `${JSON.stringify(k)}:${stablePrint(v)}`);
+        return `{${entries.join(',')}}`;
+    }
+    return JSON.stringify(node);
+}
+/** Constraint kinds that can move between column, table-elt, and ALTER form. */
+const RELOCATABLE = new Set(['CONSTR_PRIMARY', 'CONSTR_UNIQUE', 'CONSTR_FOREIGN', 'CONSTR_CHECK']);
 /**
  * Fold a table unit's statements (CREATE TABLE plus any ALTER TABLE
  * ADD COLUMN / ADD CONSTRAINT) into an effective shape, so atomic and
  * consolidated authorships of the same table compare equal.
+ *
+ * Constraint placement is representation, not semantics: `id bigint PRIMARY
+ * KEY`, a `PRIMARY KEY (id)` table elt, and `ALTER TABLE .. ADD CONSTRAINT
+ * t_pkey PRIMARY KEY (id)` all catalog identically. Relocatable constraints
+ * (PK/UNIQUE/FK/CHECK) are therefore lifted out of columns and ALTER
+ * commands into one canonical table-level set — keyed with the Postgres
+ * default name when unnamed, columns filled in from the owning column when
+ * column-attached — and PK columns gain the NOT NULL the catalog implies.
  */
 function tableShape(unit) {
     const shape = { relation: null, columns: new Map(), extras: new Map() };
+    const table = unit.identity.name;
+    const rawColumns = [];
+    const constraints = [];
+    const pkColumns = new Set();
     const addColumn = (node) => {
-        const def = node;
-        const clean = cleanTree(node);
-        shape.columns.set(def.colname ?? '', { def: clean, print: JSON.stringify(clean) });
+        const colname = node.colname ?? '';
+        const attached = node.constraints ?? [];
+        const residual = [];
+        for (const item of attached) {
+            const c = item.Constraint;
+            if (c && RELOCATABLE.has(c.contype ?? '')) {
+                constraints.push({ node: c, column: colname });
+            }
+            else {
+                residual.push(item);
+            }
+        }
+        rawColumns.push({ colname, def: { ...node, constraints: residual } });
+    };
+    const addConstraint = (node, column) => {
+        constraints.push({ node: node, column });
     };
     const addExtra = (node) => {
         const clean = cleanTree(node);
-        shape.extras.set(JSON.stringify(clean), clean);
+        shape.extras.set(stablePrint(clean), clean);
     };
     for (const text of unit.texts) {
         for (const raw of parseSync(text).sql.stmts) {
@@ -137,6 +178,9 @@ function tableShape(unit) {
                 for (const elt of elts) {
                     if (elt.ColumnDef)
                         addColumn(elt.ColumnDef);
+                    else if (elt.Constraint && RELOCATABLE.has(elt.Constraint.contype ?? '')) {
+                        addConstraint(elt.Constraint);
+                    }
                     else
                         addExtra(elt);
                 }
@@ -152,6 +196,11 @@ function tableShape(unit) {
                     if (at.subtype === 'AT_AddColumn' && def?.ColumnDef) {
                         addColumn(def.ColumnDef);
                     }
+                    else if (at.subtype === 'AT_AddConstraint' &&
+                        def?.Constraint &&
+                        RELOCATABLE.has(def.Constraint.contype ?? '')) {
+                        addConstraint(def.Constraint);
+                    }
                     else {
                         addExtra({ AlterTableCmd: at });
                     }
@@ -162,6 +211,44 @@ function tableShape(unit) {
             }
         }
     }
+    for (const { node, column } of constraints) {
+        const canonical = { ...node };
+        canonical.conname = node.conname ?? defaultConstraintName(table, node, column) ?? undefined;
+        if (column && (node.keys ?? []).length === 0 && node.contype !== 'CONSTR_FOREIGN' && node.contype !== 'CONSTR_CHECK') {
+            canonical.keys = [{ String: { sval: column } }];
+        }
+        if (column && node.contype === 'CONSTR_FOREIGN' && (node.fk_attrs ?? []).length === 0) {
+            canonical.fk_attrs = [{ String: { sval: column } }];
+        }
+        if (node.contype === 'CONSTR_PRIMARY') {
+            const keyed = canonical.keys ?? [];
+            for (const k of keyed)
+                if (k.String?.sval)
+                    pkColumns.add(k.String.sval);
+        }
+        addExtra({ Constraint: canonical });
+    }
+    for (const { colname, def } of rawColumns) {
+        const residual = (def.constraints ?? []).map(c => {
+            const constraint = c.Constraint;
+            // NOT NULL parses with parser-version-dependent extras (is_enforced,
+            // initially_valid); reduce to its semantic core so an authored NOT NULL
+            // equals the one a primary key implies.
+            if (constraint?.contype === 'CONSTR_NOTNULL') {
+                return { Constraint: { contype: 'CONSTR_NOTNULL', conname: constraint.conname } };
+            }
+            return c;
+        });
+        const hasNotNull = residual.some(c => c.Constraint?.contype === 'CONSTR_NOTNULL');
+        if (pkColumns.has(colname) && !hasNotNull) {
+            residual.push({ Constraint: { contype: 'CONSTR_NOTNULL' } });
+        }
+        const sorted = residual
+            .map(c => cleanTree(c))
+            .sort((x, y) => stablePrint(x).localeCompare(stablePrint(y)));
+        const clean = cleanTree({ ...def, constraints: sorted });
+        shape.columns.set(colname, { def: clean, print: stablePrint(clean) });
+    }
     return shape;
 }
 const deparseStmt = (node) => `${Deparser.deparse(node, { pretty: false })};`;
@@ -385,7 +472,11 @@ export function diffSchemas(from, to, options = {}) {
     }
     let forwardChanges = [];
     if (forwardSql.length > 0) {
-        const { changes, warnings: w } = restructureChanges([{ name: 'delta', dependencies: [], deploy: forwardSql.join('\n\n') }], { granularity: options.granularity ?? 'object' });
+        const { changes, warnings: w } = restructureChanges([{ name: 'delta', dependencies: [], deploy: forwardSql.join('\n\n') }], {
+            granularity: options.granularity ?? 'object',
+            changeGranularity: options.changeGranularity,
+            subObjectName: identity => pathFor(identity, { style })
+        });
         forwardChanges = changes.map(c => ({
             ...c,
             revert: inverseOf(c.deploy, c.name),