@intentius/chant-lexicon-sql 0.124.48 → 0.124.50

package/dist/postgres/plan/deep.js

@@ -38,6 +38,11 @@ const TAG = {
     [POSTGRES_ENTITY_TYPES.cast]: tags.cast,
     [POSTGRES_ENTITY_TYPES.eventTrigger]: tags.eventTrigger,
     [POSTGRES_ENTITY_TYPES.operator]: tags.operator,
+    [POSTGRES_ENTITY_TYPES.operatorClass]: tags.operatorClass,
+    [POSTGRES_ENTITY_TYPES.operatorFamily]: tags.operatorFamily,
+    [POSTGRES_ENTITY_TYPES.foreignTable]: tags.foreignTable,
+    [POSTGRES_ENTITY_TYPES.textSearchConfiguration]: tags.textSearchConfiguration,
+    [POSTGRES_ENTITY_TYPES.textSearchDictionary]: tags.textSearchDictionary,
     [POSTGRES_ENTITY_TYPES.statistics]: tags.statistics,
     [POSTGRES_ENTITY_TYPES.foreignDataWrapper]: tags.foreignDataWrapper,
     [POSTGRES_ENTITY_TYPES.foreignServer]: tags.foreignServer,
@@ -140,6 +145,12 @@ const PROP_OF_FIELD = {
     validator: ["validator", "validatorName", "noValidator"],
     serverType: ["serverType"],
     wrapper: ["wrapper", "wrapperName"],
+    server: ["serverName"],
+    family: ["family"],
+    items: ["items"],
+    template: ["template"],
+    parser: ["parser"],
+    mappings: ["mappings"],
     allTables: ["allTables"],
     tables: ["tables"],
     schemas: ["schemas"],
@@ -194,7 +205,7 @@ export function inDeclaredVocabulary(declared, live, d, l) {
                 if (f !== "schema" || d.kind === "extension")
                     adopt(key);
     }
-    if (d.kind === "table") {
+    if (d.kind === "table" || d.kind === "foreignTable") {
         const declaredColumns = declared.columns ?? [];
         const liveColumns = live.columns ?? [];
         // Columns are matched by name and listed in the declaration's order, the
@@ -219,7 +230,7 @@ export function inDeclaredVocabulary(declared, live, d, l) {
         ? ["definition"]
         : d.kind === "collation"
             ? ["provider", "lcCollate", "lcCtype", "locale", "nondeterministic", "rules"]
-            : d.kind === "foreignDataWrapper" || d.kind === "foreignServer"
+            : d.kind === "foreignDataWrapper" || d.kind === "foreignServer" || d.kind === "foreignTable" || d.kind === "textSearchDictionary"
                 ? ["options"]
                 : d.kind === "publication"
                     ? ["publish", "viaRoot", "generatedColumns"]
@@ -235,9 +246,9 @@ export function inDeclaredVocabulary(declared, live, d, l) {
         out.method = live.method;
         out.functionArgs = live.functionArgs;
     }
-    if (d.kind === "table" || d.kind === "domain") {
+    if (d.kind === "table" || d.kind === "domain" || d.kind === "foreignTable") {
         // A constraint the declaration says the same as the server is the declaration's (its name included or left out).
-        const kinds = d.kind === "domain" ? ["CHECK"] : Object.keys(CONSTRAINT_PROPS);
+        const kinds = d.kind === "table" ? Object.keys(CONSTRAINT_PROPS) : ["CHECK"];
         for (const kind of kinds) {
             const key = CONSTRAINT_PROPS[kind];
             const dl = d.constraints.filter((c) => c.kind === kind);

package/dist/postgres/plan/diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/postgres/plan/diff.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAoB,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAuB,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC3F,OAAO,EAAkE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvH,OAAO,EAAmE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AACnH,OAAO,EAAe,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AAE/E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAExE,4HAA4H;AAC5H,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,QAAQ,GAAG,gBAAgB,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;AAE3E,MAAM,WAAW,YAAa,SAAQ,SAAS,CAAC,QAAQ,CAAC;IACvD,6EAA6E;IAC7E,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,8FAA8F;IAC9F,YAAY,CAAC,EAAE,6BAA6B,EAAE,CAAC;IAC/C,sHAAsH;IACtH,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB;AAqHD,gDAAgD;AAChD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,mBAAmB,GAAG,kBAAkB,CAa5E;AA+QD;;;GAGG;AACH;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,cAAc,EAAE,EAAE,KAAK,EAAE,SAAS,cAAc,EAAE,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,YAAY,CAAC,CAAC,CAUpJ;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,SAAS,cAAc,EAAE,EAAE,QAAQ,EAAE,SAAS,cAAc,EAAE,EAAE,OAAO,GAAE,aAAkB,GAAG,YAAY,CAqClJ"}
+{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/postgres/plan/diff.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAoB,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAChG,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAuB,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC3F,OAAO,EAAkE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvH,OAAO,EAAmE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AACnH,OAAO,EAAe,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AAE/E,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AAExE,4HAA4H;AAC5H,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,QAAQ,GAAG,gBAAgB,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;AAE3E,MAAM,WAAW,YAAa,SAAQ,SAAS,CAAC,QAAQ,CAAC;IACvD,6EAA6E;IAC7E,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,8FAA8F;IAC9F,YAAY,CAAC,EAAE,6BAA6B,EAAE,CAAC;IAC/C,sHAAsH;IACtH,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB;AAqHD,gDAAgD;AAChD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,mBAAmB,GAAG,kBAAkB,CAa5E;AAoXD;;;GAGG;AACH;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,cAAc,EAAE,EAAE,KAAK,EAAE,SAAS,cAAc,EAAE,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,YAAY,CAAC,CAAC,CAUpJ;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,SAAS,cAAc,EAAE,EAAE,QAAQ,EAAE,SAAS,cAAc,EAAE,EAAE,OAAO,GAAE,aAAkB,GAAG,YAAY,CAqClJ"}

package/dist/postgres/plan/diff.js

@@ -201,7 +201,7 @@ function diffUnparsed(key, before, after, out, hints) {
     }
 }
 /** The kinds (#3911) whose definition has no ALTER: a change is a drop and a create, or (an aggregate's) CREATE OR REPLACE. */
-const REPLACED_KINDS = new Set(["composite", "range", "aggregate", "collation", "cast", "eventTrigger", "operator", "statistics"]);
+const REPLACED_KINDS = new Set(["composite", "range", "aggregate", "collation", "cast", "eventTrigger", "operator", "operatorClass", "operatorFamily", "statistics"]);
 /** What each of {@link REPLACED_KINDS} compares besides its name and comment. */
 const DEFINITION = {
     composite: ["attributeDefs"],
@@ -211,6 +211,9 @@ const DEFINITION = {
     cast: ["castMethod", "function", "context"],
     eventTrigger: ["event", "tags", "function"],
     operator: ["definition"],
+    // A class's members, type, family and default flag have no ALTER; a family has no definition besides its name and method (its identity).
+    operatorClass: ["default", "dataType", "family", "items"],
+    operatorFamily: [],
     statistics: ["table", "kinds", "targets"],
 };
 /** The kinds (#3911) the server alters in place, with the fields that cannot be altered (the object is dropped and created) and those that can. */
@@ -218,6 +221,9 @@ const ALTERED_KINDS = {
     foreignDataWrapper: { recreate: [], inPlace: ["handler", "validator", "options"] },
     foreignServer: { recreate: ["serverType", "wrapper"], inPlace: ["version", "options"] },
     publication: { recreate: ["allTables"], inPlace: ["tables", "schemas", "publish", "viaRoot", "generatedColumns"] },
+    // ALTER TEXT SEARCH DICTIONARY sets options and cannot change the template; ALTER TEXT SEARCH CONFIGURATION maps token types and cannot change the parser (SQLPG305).
+    textSearchDictionary: { recreate: ["template"], inPlace: ["options"], rule: "SQLPG305" },
+    textSearchConfiguration: { recreate: ["parser"], inPlace: ["mappings"], rule: "SQLPG305" },
 };
 /**
  * A foreign data wrapper's, foreign server's or publication's change: the
@@ -229,11 +235,15 @@ const ALTERED_KINDS = {
 function diffAltered(key, before, after, out) {
     if (!same(before.fields.comment, after.fields.comment))
         out.push(change(key, "comment", "SQLPG216", show(before.fields.comment), show(after.fields.comment)));
-    const { recreate, inPlace } = ALTERED_KINDS[after.kind];
+    const { recreate, inPlace, rule = "SQLPG303" } = ALTERED_KINDS[after.kind];
     const replaced = recreate.filter((k) => !same(before.fields[k], after.fields[k]));
+    // An object that lives in a schema is another object under another name: a rename between builds is a drop and a create.
+    if (after.schema !== undefined && (before.schema !== after.schema || before.name !== after.name))
+        replaced.unshift("name");
     if (replaced.length > 0) {
-        const was = replaced.map((k) => `${k} ${show(before.fields[k]) ?? "-"}`).join("; ");
-        const now = replaced.map((k) => `${k} ${show(after.fields[k]) ?? "-"}`).join("; ");
+        const value = (o, k) => (k === "name" ? qualified(o) : (show(o.fields[k]) ?? "-"));
+        const was = replaced.map((k) => `${k} ${value(before, k)}`).join("; ");
+        const now = replaced.map((k) => `${k} ${value(after, k)}`).join("; ");
         if (before.dependents && before.dependents.length > 0) {
             out.push(change(key, replaced.join(", "), "SQLPG301", was, now, { note: `${before.dependents.join(", ")} depend${before.dependents.length === 1 ? "s" : ""} on it` }));
         }
@@ -243,7 +253,98 @@ function diffAltered(key, before, after, out) {
     }
     for (const k of inPlace)
         if (!same(before.fields[k], after.fields[k]))
-            out.push(change(key, k, "SQLPG303", show(before.fields[k]), show(after.fields[k])));
+            out.push(change(key, k, rule, show(before.fields[k]), show(after.fields[k])));
+}
+/**
+ * Which of an operator's attributes `ALTER OPERATOR ... SET` can change from
+ * what the server holds (the Postgres 18 page, with the supported majors):
+ * RESTRICT and JOIN on every major, set or removed; from 17 COMMUTATOR and
+ * NEGATOR when the operator has none, and HASHES and MERGES when off, never
+ * back. Anything else about the definition is dropped and created.
+ */
+function operatorAlterable(key, before, after, major) {
+    if (key === "restrict" || key === "join")
+        return true;
+    if (major < 17)
+        return false;
+    if (key === "commutator" || key === "negator")
+        return before[key] === undefined && after[key] !== undefined;
+    if (key === "hashes" || key === "merges")
+        return before[key] === undefined && after[key] === "true";
+    return false;
+}
+/** An operator's change: in place (SQLPG304) when every attribute that changed is one ALTER OPERATOR reaches, else dropped and created like the other kinds without an ALTER. */
+function diffOperator(key, before, after, out, major) {
+    const bo = (before.fields.definition ?? {});
+    const ao = (after.fields.definition ?? {});
+    const renamed = before.schema !== after.schema || before.name !== after.name || before.signature !== after.signature;
+    // In the order the page lists them, so the statement reads the same whatever the order the options were written in.
+    const ORDER = ["restrict", "join", "commutator", "negator", "hashes", "merges"];
+    const rank = (k) => (ORDER.includes(k) ? ORDER.indexOf(k) : ORDER.length);
+    const changed = [...new Set([...Object.keys(bo), ...Object.keys(ao)])].filter((k) => !same(bo[k], ao[k])).sort((a, b) => rank(a) - rank(b) || (a < b ? -1 : 1));
+    if (renamed || !changed.every((k) => operatorAlterable(k, bo, ao, major))) {
+        diffReplaced(key, before, after, out);
+        return;
+    }
+    if (!same(before.fields.comment, after.fields.comment))
+        out.push(change(key, "comment", "SQLPG216", show(before.fields.comment), show(after.fields.comment)));
+    const note = major < 17 ? undefined : "from 17 ALTER OPERATOR also sets a commutator's or negator's own commutator or negator";
+    for (const k of changed)
+        out.push(change(key, `definition.${k}`, "SQLPG304", show(bo[k]), show(ao[k]), note && (k === "commutator" || k === "negator") ? { note } : {}));
+}
+/**
+ * A foreign table's columns, as ALTER FOREIGN TABLE changes them (SQLPG306):
+ * all catalog changes, none reading the remote side. A column is its name
+ * (a rename is a drop and an add); its comment is the generic comment rule.
+ */
+function diffForeignColumns(key, before, after, out) {
+    const byName = new Map(before.columns.map((c) => [c.name, c]));
+    const afterNames = new Set(after.columns.map((c) => c.name));
+    for (const b of before.columns)
+        if (!afterNames.has(b.name))
+            out.push(change(key, `columns.${b.name}`, "SQLPG306", `${b.name} ${b.type ?? ""}`.trim(), undefined));
+    for (const a of after.columns) {
+        const b = byName.get(a.name);
+        if (!b) {
+            out.push(change(key, `columns.${a.name}`, "SQLPG306", undefined, `${a.name} ${a.type ?? ""}`.trim()));
+            continue;
+        }
+        const at = `columns.${a.name}`;
+        if (b.type !== a.type)
+            out.push(change(key, `${at}.type`, "SQLPG306", b.type, a.type));
+        if (b.collate !== a.collate)
+            out.push(change(key, `${at}.collate`, "SQLPG306", b.collate, a.collate));
+        if (b.default !== a.default)
+            out.push(change(key, `${at}.default`, "SQLPG306", b.default, a.default));
+        if (b.notNull !== a.notNull)
+            out.push(change(key, `${at}.notNull`, "SQLPG306", b.notNull ? "NOT NULL" : "NULL", a.notNull ? "NOT NULL" : "NULL"));
+        if (!same(b.options, a.options))
+            out.push(change(key, `${at}.options`, "SQLPG306", show(b.options), show(a.options)));
+        if (b.comment !== a.comment)
+            out.push(change(key, `${at}.comment`, "SQLPG216", b.comment, a.comment));
+    }
+}
+/** A foreign table's CHECK constraints: a dropped one first, so a constraint replaced under its name is dropped before it is added. */
+function diffForeignConstraints(key, before, after, out) {
+    const label = (c) => (c.name ? `${c.name}: ${c.body}` : c.body);
+    const remaining = [...before.constraints];
+    const added = [];
+    const comments = [];
+    for (const a of after.constraints) {
+        const i = remaining.findIndex((b) => sameConstraint(a, b));
+        if (i < 0) {
+            added.push(a);
+            continue;
+        }
+        const b = remaining.splice(i, 1)[0];
+        if (b.comment !== a.comment)
+            comments.push(change(key, `constraints.${a.name ?? b.name}.comment`, "SQLPG216", b.comment, a.comment));
+    }
+    for (const b of remaining)
+        out.push(change(key, `constraints.${b.name ?? b.kind.toLowerCase()}`, "SQLPG306", label(b), undefined));
+    for (const a of added)
+        out.push(change(key, `constraints.${a.name ?? a.kind.toLowerCase()}`, "SQLPG306", undefined, label(a)));
+    out.push(...comments);
 }
 /**
  * A type's, aggregate's, collation's, cast's or event trigger's change: its
@@ -285,6 +386,15 @@ function diffObject(key, before, after, out, hints, major) {
         if (!same(b, a))
             out.push(change(key, name, rule, show(b), show(a), extra));
     };
+    if (after.kind === "operator") {
+        diffOperator(key, before, after, out, major);
+        return;
+    }
+    // A foreign table moved to another server is another table: ALTER FOREIGN TABLE has no SERVER action.
+    if (after.kind === "foreignTable" && before.schema === after.schema && before.name === after.name && !same(before.fields.server, after.fields.server)) {
+        out.push(change(key, "server", before.dependents && before.dependents.length > 0 ? "SQLPG301" : "SQLPG300", show(before.fields.server), show(after.fields.server), before.dependents && before.dependents.length > 0 ? { note: `${before.dependents.join(", ")} depend${before.dependents.length === 1 ? "s" : ""} on it` } : {}));
+        return;
+    }
     if (REPLACED_KINDS.has(after.kind)) {
         // A cast is named by its types, and an aggregate's argument types are its identity: either changed, between two builds, is another object.
         if (after.kind === "cast" && before.name !== after.name) {
@@ -425,6 +535,11 @@ function diffObject(key, before, after, out, hints, major) {
             field("attributes", "SQLPG294");
             field("connectionLimit", "SQLPG294");
             break;
+        case "foreignTable":
+            diffForeignColumns(key, before, after, out);
+            diffForeignConstraints(key, before, after, out);
+            field("options", "SQLPG306");
+            break;
         case "table":
             if (!same(before.fields.rowSecurity, after.fields.rowSecurity) || !same(before.fields.forceRowSecurity, after.fields.forceRowSecurity)) {
                 const state = (o) => (o.fields.rowSecurity ? (o.fields.forceRowSecurity ? "enabled, forced" : "enabled") : o.fields.forceRowSecurity ? "disabled, forced" : "disabled");

package/dist/postgres/plan/normalize.d.ts

@@ -73,6 +73,8 @@ export interface CanonicalColumn {
     collate?: string;
     compression?: string;
     storage?: string;
+    /** A foreign table column's `OPTIONS`, sorted by name. */
+    options?: Record<string, string>;
     comment?: string;
 }
 export interface CanonicalConstraint {
@@ -85,7 +87,7 @@ export interface CanonicalConstraint {
     notValid?: boolean;
     comment?: string;
 }
-export type CanonicalKind = "schema" | "table" | "index" | "view" | "materializedView" | "sequence" | "enum" | "composite" | "range" | "domain" | "extension" | "aggregate" | "collation" | "cast" | "eventTrigger" | "operator" | "statistics" | "foreignDataWrapper" | "foreignServer" | "publication" | "function" | "procedure" | "trigger" | "policy" | "role" | "grant" | "defaultPrivileges";
+export type CanonicalKind = "schema" | "table" | "index" | "view" | "materializedView" | "sequence" | "enum" | "composite" | "range" | "domain" | "extension" | "aggregate" | "collation" | "cast" | "eventTrigger" | "operator" | "operatorClass" | "operatorFamily" | "foreignTable" | "textSearchConfiguration" | "textSearchDictionary" | "statistics" | "foreignDataWrapper" | "foreignServer" | "publication" | "function" | "procedure" | "trigger" | "policy" | "role" | "grant" | "defaultPrivileges";
 /** The kinds whose declarations are privileges, compared as the access they add up to (`../access/`), not one by one. */
 export declare const ACCESS_KINDS: ReadonlySet<CanonicalKind>;
 /** The kinds a profile manages only when it says so (`sql.profiles.<env>.access`). */
@@ -143,6 +145,15 @@ export declare function operatorSignature(p: Pick<OperatorProps, "leftArg" | "ri
  * in the new operator's own schema, as `schema.symbol`.
  */
 export declare function canonicalOperatorRef(text: string, ownSchema: string): string;
+/**
+ * A name where an object is named (a text search parser, template or
+ * dictionary, an operator family): the schema left off when it is
+ * `pg_catalog` or the default schema, since a bare name is looked for in both.
+ * The catalog prints every schema, so both sides are brought to this form.
+ */
+export declare function canonicalRef(text: string, defaultSchema: string): string;
+/** An operator named in an operator class: `OPERATOR(app.<<)`, `app.<<` or a bare symbol, by `canonicalRef`'s rule for the schema. */
+export declare function canonicalOperatorName(text: string, defaultSchema: string): string;
 /**
  * The kinds of statistics gathered, sorted. Left out, the server builds all
  * three, except for a lone expression, which gets none of them (only the

package/dist/postgres/plan/normalize.d.ts.map

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

package/dist/postgres/plan/normalize.js

@@ -304,6 +304,11 @@ const kindOf = {
     "Postgres::Cast": "cast",
     "Postgres::EventTrigger": "eventTrigger",
     "Postgres::Operator": "operator",
+    "Postgres::OperatorClass": "operatorClass",
+    "Postgres::OperatorFamily": "operatorFamily",
+    "Postgres::ForeignTable": "foreignTable",
+    "Postgres::TextSearchConfiguration": "textSearchConfiguration",
+    "Postgres::TextSearchDictionary": "textSearchDictionary",
     "Postgres::Statistics": "statistics",
     "Postgres::ForeignDataWrapper": "foreignDataWrapper",
     "Postgres::ForeignServer": "foreignServer",
@@ -653,6 +658,112 @@ function operatorOptions(p, ownSchema, defaultSchema) {
     }
     return Object.fromEntries(Object.entries(out).sort(([a], [b]) => (a < b ? -1 : 1)));
 }
+/**
+ * A name where an object is named (a text search parser, template or
+ * dictionary, an operator family): the schema left off when it is
+ * `pg_catalog` or the default schema, since a bare name is looked for in both.
+ * The catalog prints every schema, so both sides are brought to this form.
+ */
+export function canonicalRef(text, defaultSchema) {
+    const pieces = canonicalName(text).split(/\.(?=(?:[^"]*"[^"]*")*[^"]*$)/);
+    if (pieces.length >= 2) {
+        const schema = identValue(pieces[0]);
+        return schema === "pg_catalog" || schema === defaultSchema ? pieces.slice(1).join(".") : pieces.join(".");
+    }
+    return pieces[0];
+}
+/** An operator named in an operator class: `OPERATOR(app.<<)`, `app.<<` or a bare symbol, by `canonicalRef`'s rule for the schema. */
+export function canonicalOperatorName(text, defaultSchema) {
+    const inner = text.trim().replace(/^OPERATOR\s*\(\s*(.*?)\s*\)$/is, "$1").trim();
+    const m = /^("(?:[^"]|"")+"|[A-Za-z_][A-Za-z0-9_$]*)\s*\.\s*(\S.*)$/s.exec(inner);
+    if (!m)
+        return inner;
+    const schema = identValue(m[1]);
+    return schema === "pg_catalog" || schema === defaultSchema ? m[2].trim() : `${quoteIdent(schema)}.${m[2].trim()}`;
+}
+/** A comma list split at its top level: `numeric(12,2), text` is two items. */
+function splitTopLevel(text) {
+    const out = [];
+    let depth = 0;
+    let current = "";
+    for (const ch of text) {
+        if (ch === "(" || ch === "[")
+            depth++;
+        else if (ch === ")" || ch === "]")
+            depth--;
+        if (ch === "," && depth === 0) {
+            out.push(current.trim());
+            current = "";
+        }
+        else
+            current += ch;
+    }
+    if (current.trim() !== "")
+        out.push(current.trim());
+    return out;
+}
+/**
+ * The operand types a support function of an operator class is registered
+ * for when `FUNCTION n (left, right)` does not say (sql-createopclass): a
+ * B-tree comparison function's (1) and a hash function's (1, 2) are the
+ * function's own input types, a B-tree `in_range` function's (3) its first
+ * and third, and every other support function's the class's type. The catalog
+ * always stores both, so a declaration is brought to them.
+ */
+function supportTypes(method, number, classType, args) {
+    if (method === "btree" && number === 1)
+        return [args[0] ?? classType, args[1] ?? args[0] ?? classType];
+    if (method === "btree" && number === 3)
+        return [args[0] ?? classType, args[2] ?? classType];
+    if (method === "hash" && (number === 1 || number === 2))
+        return [args[0] ?? classType, args[0] ?? classType];
+    return [classType, classType];
+}
+/** An operator class as compared: its type, family, default flag and members, each member canonical and the list sorted. */
+function operatorClassFields(p, schema, defaultSchema, fields) {
+    const type = canonicalType(p.dataType, defaultSchema);
+    fields.default = p.default === true;
+    fields.dataType = type;
+    // A class with no FAMILY is in a family of its own name; so is one that names that family.
+    const own = canonicalRef(`${quoteIdent(schema)}.${quoteIdent(p.name)}`, defaultSchema);
+    const named = p.family === undefined ? own : /^\s*("(?:[^"]|"")+"|[A-Za-z_][A-Za-z0-9_$]*)\s*$/.test(p.family) && identValue(p.family.trim()) === p.name ? own : canonicalRef(p.family, defaultSchema);
+    fields.family = named === own ? undefined : named;
+    const side = (t) => (t.trim().toUpperCase() === "NONE" ? "NONE" : canonicalArgType(t, defaultSchema));
+    const members = p.items.map((i) => {
+        if (i.kind === "storage")
+            return { rank: 2, number: 0, text: `storage ${canonicalType(i.type, defaultSchema)}` };
+        const n = Number(i.number);
+        if (i.kind === "operator") {
+            const [l, r] = i.types !== undefined ? splitTopLevel(i.types) : [type, type];
+            const sorted = i.orderBy !== undefined ? ` for order by ${canonicalRef(i.orderBy, defaultSchema)}` : "";
+            return { rank: 0, number: n, text: `operator ${n} ${canonicalOperatorName(i.operator, defaultSchema)} (${side(l ?? type)},${side(r ?? l ?? type)})${sorted}` };
+        }
+        const args = splitTopLevel(i.args).map((a) => canonicalArgType(a, defaultSchema));
+        const given = i.types !== undefined ? splitTopLevel(i.types).map(side) : undefined;
+        const [l, r] = given ? [given[0], given[1] ?? given[0]] : supportTypes(p.method, n, type, args);
+        return { rank: 1, number: n, text: `function ${n} (${l},${r}) ${canonicalFunctionName(i.function, defaultSchema)}(${args.join(",")})` };
+    });
+    members.sort((a, b) => a.rank - b.rank || a.number - b.number || (a.text < b.text ? -1 : 1));
+    fields.items = members.map((m) => m.text);
+}
+/** A dictionary option's value as compared: a string constant's value, a quoted name's, a bare word folded, a number as written. */
+function dictionaryValue(v) {
+    const t = v.trim();
+    if (/^([Ee]?'|\$)/.test(t))
+        return stringValue(t) ?? t;
+    if (/^"/.test(t))
+        return identValue(t);
+    return t.toLowerCase();
+}
+/** A text search configuration's mappings as compared: each token type to its dictionaries in order, sorted by token type. */
+function mappingFields(p, defaultSchema) {
+    const out = {};
+    for (const m of p.mappings)
+        for (const t of m.tokens)
+            out[t.toLowerCase()] = m.dictionaries.map((d) => canonicalRef(d, defaultSchema));
+    const entries = Object.entries(out).sort(([a], [b]) => (a < b ? -1 : 1));
+    return entries.length > 0 ? Object.fromEntries(entries) : undefined;
+}
 /** An `OPTIONS (...)` list as compared: by name, none as nothing. */
 function sortedOptions(options) {
     const entries = Object.entries(options ?? {}).sort(([a], [b]) => (a < b ? -1 : 1));
@@ -770,6 +881,46 @@ export function canonicalPgObject(entityType, props, defaultSchema = "public") {
             fields.definition = operatorOptions(p, base.schema, defaultSchema);
             break;
         }
+        case "operatorClass":
+            operatorClassFields(props, base.schema, defaultSchema, fields);
+            base.signature = ` USING ${props.method}`;
+            break;
+        case "operatorFamily":
+            base.signature = ` USING ${props.method}`;
+            break;
+        case "textSearchDictionary": {
+            const p = props;
+            fields.template = canonicalRef(p.template, defaultSchema);
+            fields.options = sortedOptions(Object.fromEntries(Object.entries(p.options).map(([k, v]) => [k.toLowerCase(), dictionaryValue(v)])));
+            break;
+        }
+        case "textSearchConfiguration": {
+            const p = props;
+            fields.parser = canonicalRef(p.parser, defaultSchema);
+            fields.mappings = mappingFields(p, defaultSchema);
+            break;
+        }
+        case "foreignTable": {
+            const p = props;
+            p.columns.forEach((c, position) => {
+                const options = sortedOptions(c.options);
+                columns.push({
+                    name: c.name,
+                    position,
+                    type: canonicalType(c.type, defaultSchema),
+                    notNull: c.notNull === true,
+                    default: canonicalExpr(c.default),
+                    collate: c.collate ? canonicalName(c.collate) : undefined,
+                    comment: comment(c.comment),
+                    ...(options ? { options } : {}),
+                });
+            });
+            for (const c of p.checks)
+                constraints.push({ kind: "CHECK", name: c.name, body: ["check", canonicalExpr(c.expr), c.noInherit ? "no inherit" : ""].filter(Boolean).join(" "), ...(c.notValid ? { notValid: true } : {}), comment: comment(c.comment) });
+            fields.server = quoteIdent(p.serverName);
+            fields.options = sortedOptions(p.options);
+            break;
+        }
         case "statistics": {
             const p = props;
             fields.table = canonicalName(p.tableName, defaultSchema);

package/dist/postgres/plan/rules.d.ts

@@ -97,6 +97,9 @@ export declare const PG_CLASSIFIER_RULES: {
     readonly SQLPG301: PgClassifierRule;
     readonly SQLPG302: PgClassifierRule;
     readonly SQLPG303: PgClassifierRule;
+    readonly SQLPG304: PgClassifierRule;
+    readonly SQLPG305: PgClassifierRule;
+    readonly SQLPG306: PgClassifierRule;
     readonly SQLPG270: PgClassifierRule;
 };
 export type PgClassifierRuleId = keyof typeof PG_CLASSIFIER_RULES;

package/dist/postgres/plan/rules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../../src/postgres/plan/rules.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAkB,KAAK,aAAa,EAAE,KAAK,cAAc,IAAI,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAErH,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,UAAU,GAAG,cAAc,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEhH,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC;AAEhE,eAAO,MAAM,iBAAiB,EAAE,aAAa,CAAC,aAAa,CAY1D,CAAC;AASF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4UqB,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAAG,MAAM,OAAO,mBAAmB,CAAC"}
+{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../../src/postgres/plan/rules.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAkB,KAAK,aAAa,EAAE,KAAK,cAAc,IAAI,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAErH,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,UAAU,GAAG,cAAc,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEhH,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC;AAEhE,eAAO,MAAM,iBAAiB,EAAE,aAAa,CAAC,aAAa,CAY1D,CAAC;AASF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiWqB,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAAG,MAAM,OAAO,mBAAmB,CAAC"}

package/dist/postgres/plan/rules.js

@@ -108,9 +108,12 @@ export const PG_CLASSIFIER_RULES = {
     SQLPG297: rule("SQLPG297", "metadata", "Revoke a privilege", "REVOKE removes from the object's privileges in the catalog. The role loses it at once: its next statement that needs it fails, so move every reader off it first.", `${DOCS}/sql-revoke.html`),
     SQLPG298: rule("SQLPG298", "metadata", "Change default privileges", "ALTER DEFAULT PRIVILEGES changes what objects created afterwards are given; objects that exist keep their privileges.", `${DOCS}/sql-alterdefaultprivileges.html`),
     SQLPG299: rule("SQLPG299", "expand", "Change a clause chant does not read", "chant's parser does not know this clause, so it cannot tell which lock the change takes or whether an in-place statement makes it; the plan refuses it rather than guess. Review it: make it by hand with the ALTER the server documents for the clause, or as expand and contract.", `${DOCS}/sql-altertable.html`),
-    SQLPG300: rule("SQLPG300", "metadata", "Drop and create a type, aggregate, collation, cast, event trigger, operator, statistics object, foreign server or publication", "A composite or range type's definition, a collation's, a cast's, an event trigger's, an operator's function and operands and extended statistics' have no ALTER, an aggregate's argument types, state type and final function cannot be replaced, and neither can a foreign server's type or wrapper or a publication's FOR ALL TABLES: the object is dropped and created in one transaction. Nothing on the server depends on it (a column, a view, a function or a cast would make the DROP fail); the locks are on its catalog rows only. Dropped statistics are empty until the next ANALYZE, and a publication that is dropped stops its subscribers until it is created again.", `${DOCS}/sql-createtype.html`),
-    SQLPG301: rule("SQLPG301", "expand", "Change a type, aggregate, collation, cast, foreign server or publication that other objects depend on", "No ALTER makes the change, and DROP refuses while a column, a view, a function or another object depends on the object. Create the new definition under another name, move what depends on it, then drop the old.", `${DOCS}/sql-droptype.html`),
+    SQLPG300: rule("SQLPG300", "metadata", "Drop and create a type, aggregate, collation, cast, event trigger, operator, operator class or family, foreign table's server, text search object, statistics object, foreign server or publication", "A composite or range type's definition, a collation's, a cast's, an event trigger's, an operator's function and operands, and any attribute of it that SQLPG304 does not alter, an operator class's members, type, family and default flag, an operator family's index method, and extended statistics' have no ALTER (ALTER OPERATOR CLASS and ALTER OPERATOR FAMILY change a name, an owner or a schema only), an aggregate's argument types, state type and final function cannot be replaced, and neither can a foreign server's type or wrapper, a foreign table's server, a text search configuration's parser, a text search dictionary's template or a publication's FOR ALL TABLES: the object is dropped and created in one transaction. Nothing on the server depends on it (a column, a view, an index, a function or a cast would make the DROP fail); the locks are on its catalog rows only. Dropped statistics are empty until the next ANALYZE, and a publication that is dropped stops its subscribers until it is created again.", `${DOCS}/sql-createtype.html`),
+    SQLPG301: rule("SQLPG301", "expand", "Change a type, aggregate, collation, cast, operator, operator class, text search object, foreign table's server, foreign server or publication that other objects depend on", "No ALTER makes the change, and DROP refuses while a column, a view, an index, a function or another object depends on the object. Create the new definition under another name, move what depends on it, then drop the old.", `${DOCS}/sql-droptype.html`),
     SQLPG302: rule("SQLPG302", "metadata", "Replace an aggregate's definition", "CREATE OR REPLACE AGGREGATE (14 and later) replaces the aggregate's functions and options in the catalog; no table is locked. Its argument types, its result and its kind (plain, ordered-set, hypothetical-set) have to stay the same, so a change of the state type or the final function is dropped and created instead (SQLPG300).", `${DOCS}/sql-createaggregate.html`),
     SQLPG303: rule("SQLPG303", "metadata", "Alter a foreign data wrapper, foreign server or publication in place", "ALTER FOREIGN DATA WRAPPER (handler, validator, options), ALTER SERVER (version, options) and ALTER PUBLICATION (SET options, ADD and DROP TABLE and TABLES IN SCHEMA) change the object's catalog rows under a brief lock; no table is rewritten. A publication's change reaches its subscribers as the walsender next reads it: a table added is not copied to a subscription until the subscriber runs REFRESH PUBLICATION.", `${DOCS}/sql-alterpublication.html`),
+    SQLPG304: rule("SQLPG304", "metadata", "Alter an operator in place", "ALTER OPERATOR ... SET changes the operator's catalog row under a brief lock; no index or table is read. RESTRICT and JOIN can be set or removed (NONE) on every supported major. From 17, COMMUTATOR and NEGATOR can be set when the operator has none, and HASHES and MERGES turned on, never off (the Postgres 18 page: \"Can only be changed if the operator does not have an existing commutator\", \"Can only be enabled and not disabled\"); setting a commutator or negator also sets the other operator's. On 14 to 16 only RESTRICT and JOIN are alterable, so any other change drops and creates the operator (SQLPG300), as does a change of function or operands on any major.", `${DOCS}/sql-alteroperator.html`),
+    SQLPG305: rule("SQLPG305", "metadata", "Alter a text search configuration's mappings or a dictionary's options in place", "ALTER TEXT SEARCH CONFIGURATION ADD MAPPING, ALTER MAPPING and DROP MAPPING change the token types mapped to dictionaries; ALTER TEXT SEARCH DICTIONARY sets a template's options, and an option named with no value is removed. Both change catalog rows under a brief lock and leave the parser or template as it is, so a parser or template change is dropped and created (SQLPG300). A tsvector already stored keeps the tokens it was built with: rebuild the columns and indexes that hold one when the mappings or options change what a word becomes. The same applies on 14 to 18.", `${DOCS}/sql-altertsconfig.html`),
+    SQLPG306: rule("SQLPG306", "metadata", "Alter a foreign table in place", "ALTER FOREIGN TABLE adds and drops columns, changes a column's type, default, NOT NULL and OPTIONS, adds and drops CHECK and NOT NULL constraints, and sets the table's OPTIONS, all in the catalog. Nothing is checked against the remote side and no row is rewritten or scanned (\"It is the user's responsibility to ensure that the table definition matches the remote side\"), so a CHECK is added with no validation pass. A foreign table's server cannot be altered, so a change of server is dropped and created (SQLPG300).", `${DOCS}/sql-alterforeigntable.html`),
     SQLPG270: rule("SQLPG270", "drop", "Drop an object", "The object and, for a table, a materialized view or a sequence, its data are gone.", `${DOCS}/sql-droptable.html`),
 };

package/dist/postgres/plan/schema.js

@@ -73,7 +73,7 @@ export function pgSchemaFromBuildFile(path, defaultSchema = "public") {
 export function pgNamespace(kind) {
     if (kind === "schema" || kind === "extension" || kind === "trigger" || kind === "policy" || kind === "role")
         return kind;
-    if (kind === "collation" || kind === "cast" || kind === "eventTrigger" || kind === "operator" || kind === "statistics" || kind === "foreignDataWrapper" || kind === "foreignServer" || kind === "publication")
+    if (kind === "collation" || kind === "cast" || kind === "eventTrigger" || kind === "operator" || kind === "operatorClass" || kind === "operatorFamily" || kind === "textSearchConfiguration" || kind === "textSearchDictionary" || kind === "statistics" || kind === "foreignDataWrapper" || kind === "foreignServer" || kind === "publication")
         return kind;
     if (kind === "grant" || kind === "defaultPrivileges")
         return "grant";

package/dist/postgres/plan/statements.d.ts

@@ -0,0 +1,26 @@
+/**
+ * The Postgres statement classifier (#4407): a migration file's statements,
+ * each given the class and rule the schema-diff classifier (`./rules.ts`)
+ * gives the same change, with the lock the rule's restriction names. It reads
+ * text and contacts no server.
+ *
+ * `CREATE`, `GRANT`, `REVOKE`, `COMMENT ON` and `ALTER TABLE ... ROW LEVEL
+ * SECURITY` go through the declaration parser (`../parser.ts`). The parser
+ * has no `ALTER` grammar, so the other `ALTER` and `DROP` statements are read
+ * word by word from the same tokens.
+ *
+ * A statement alone cannot decide some changes. `ALTER COLUMN ... TYPE` is a
+ * catalog change or a table rewrite by the column's old type, which the file
+ * does not state: it is `undecided`, naming SQLPG206 and SQLPG207 (and
+ * SQLPG208 with a `USING` expression). `CREATE OR REPLACE VIEW` is SQLPG250
+ * or SQLPG251 by whether the columns stay. A statement no rule covers is
+ * `unclassified` with a note.
+ */
+import { type StatementVerdict } from "../../core/statement-class.js";
+/**
+ * Classify a migration's up statements, in order. The statements are the
+ * file's own text, one per entry (a Flyway file after placeholder
+ * substitution).
+ */
+export declare function classifyPgStatements(statements: readonly string[]): StatementVerdict[];
+//# sourceMappingURL=statements.d.ts.map

package/dist/postgres/plan/statements.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"statements.d.ts","sourceRoot":"","sources":["../../../src/postgres/plan/statements.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAIH,OAAO,EAA0E,KAAK,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAuP3I;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAyBtF"}