@intentius/chant-lexicon-sql 0.124.46 → 0.124.48

package/dist/postgres/parser.js

@@ -116,6 +116,12 @@ export const AGGREGATE_OPTIONS = [
 ];
 /** `CREATE COLLATION`'s options (sql-createcollation). */
 export const COLLATION_OPTIONS = ["locale", "lc_collate", "lc_ctype", "provider", "deterministic", "rules", "version"];
+/** `CREATE OPERATOR`'s options (sql-createoperator); `procedure` is the old spelling of `function`. */
+export const OPERATOR_OPTIONS = ["function", "procedure", "leftarg", "rightarg", "commutator", "negator", "restrict", "join", "hashes", "merges"];
+/** `CREATE STATISTICS`'s kinds (sql-createstatistics). */
+export const STATISTICS_KINDS = ["ndistinct", "dependencies", "mcv"];
+/** `CREATE PUBLICATION ... WITH (...)`'s options (sql-createpublication); `publish_generated_columns` is 18's. */
+export const PUBLICATION_OPTIONS = ["publish", "publish_via_partition_root", "publish_generated_columns"];
 /** What may follow `IS` inside a `b_expr`. */
 const B_EXPR_IS = [["DISTINCT", "FROM"], ["NOT", "DISTINCT", "FROM"], ["DOCUMENT"], ["NOT", "DOCUMENT"]];
 class PgParser extends SqlCursor {
@@ -725,6 +731,16 @@ class PgParser extends SqlCursor {
                 return this.cast();
             if (this.acceptSeq("EVENT", "TRIGGER"))
                 return this.eventTrigger();
+            if (this.accept("OPERATOR"))
+                return this.operator();
+            if (this.accept("STATISTICS"))
+                return this.statistics();
+            if (this.acceptSeq("FOREIGN", "DATA", "WRAPPER"))
+                return this.foreignDataWrapper();
+            if (this.accept("SERVER"))
+                return this.foreignServer();
+            if (this.accept("PUBLICATION"))
+                return this.publication();
             if (kw(this.peek(), "UNIQUE", "INDEX"))
                 return this.index();
         }
@@ -740,7 +756,7 @@ class PgParser extends SqlCursor {
             return this.view(true, false, false, false);
         if (this.accept("VIEW"))
             return this.view(false, orReplace, persistence === "temporary", recursive);
-        return this.fail("expected SCHEMA, TABLE, INDEX, VIEW, MATERIALIZED VIEW, SEQUENCE, TYPE, DOMAIN, EXTENSION, FUNCTION, PROCEDURE, AGGREGATE, TRIGGER, EVENT TRIGGER, COLLATION, CAST, POLICY or ROLE");
+        return this.fail("expected SCHEMA, TABLE, INDEX, VIEW, MATERIALIZED VIEW, SEQUENCE, TYPE, DOMAIN, EXTENSION, FUNCTION, PROCEDURE, AGGREGATE, TRIGGER, EVENT TRIGGER, COLLATION, CAST, OPERATOR, STATISTICS, FOREIGN DATA WRAPPER, SERVER, PUBLICATION, POLICY or ROLE");
     }
     schema() {
         const node = { statement: "schema", ifNotExists: this.ifNotExists() };
@@ -993,6 +1009,167 @@ class PgParser extends SqlCursor {
         this.expectPunct(")");
         return node;
     }
+    /** An unqualified, database-wide object's name (a wrapper, a server, a publication). */
+    databaseName(what) {
+        const { text, span } = this.nameTok(what);
+        if (this.isPunct("."))
+            this.fail(`expected ${what} without a schema (it belongs to the database)`);
+        return { pieces: [text], span };
+    }
+    /** `( name 'value' [, ...] )`: a foreign data wrapper's or server's options. */
+    genericOptions() {
+        this.expectPunct("(");
+        const out = [];
+        const seen = new Set();
+        for (;;) {
+            const t = this.next();
+            if (t.kind !== "ident" && t.kind !== "qident")
+                this.fail("expected an option name", t);
+            const nameSpan = this.span(this.idx(-1), []);
+            const name = identValue(t);
+            if (seen.has(name))
+                this.fail(`${name} is given twice`, t);
+            seen.add(name);
+            const v = this.next();
+            if (v.kind !== "string" && v.kind !== "ref")
+                this.fail("expected the option's value, a string", v);
+            out.push({ name, nameSpan, value: this.span(this.idx(-1), v.kind === "ref" ? [v.part] : []) });
+            if (this.acceptPunct(","))
+                continue;
+            this.expectPunct(")");
+            return out;
+        }
+    }
+    /** `[schema.]symbol`: an operator's name, its symbol made of operator characters. */
+    operatorName() {
+        const from = this.idx();
+        const refs = [];
+        const pieces = [];
+        const symbol = () => {
+            const t = this.next();
+            if (t.kind !== "op")
+                this.fail("expected the operator's symbol (operator characters, such as ===)", t);
+            pieces.push(t.text);
+        };
+        if (this.peek()?.kind === "op")
+            symbol();
+        else {
+            const t = this.next();
+            this.colId(t, "a schema name");
+            if (t.kind === "ref")
+                refs.push(t.part);
+            pieces.push(t.kind === "ref" ? "" : identValue(t));
+            this.expectPunct(".");
+            symbol();
+        }
+        return { pieces, span: this.span(from, refs) };
+    }
+    operator() {
+        if (kw(this.peek(), "CLASS", "FAMILY") && !this.isPunct(".", 1))
+            this.fail("expected the operator's name (CREATE OPERATOR CLASS and CREATE OPERATOR FAMILY are not declared)");
+        const name = this.operatorName();
+        const options = this.definition("an operator option");
+        this.checkDefinition(options, OPERATOR_OPTIONS, [], "an operator");
+        if (!options.some((o) => o.name === "function" || o.name === "procedure"))
+            this.fail("expected FUNCTION (an operator needs the function it calls)", this.lastSeen());
+        return { statement: "operator", name, options };
+    }
+    statistics() {
+        const ifNotExists = this.ifNotExists();
+        const name = this.qualifiedName("a statistics name");
+        const kinds = [];
+        if (this.isPunct("(")) {
+            for (const k of this.nameList("a statistics kind")) {
+                if (!STATISTICS_KINDS.includes(k.name))
+                    this.fail(`expected a statistics kind (${STATISTICS_KINDS.join(", ")})`, this.tokens[k.span.from]);
+                kinds.push(k.name);
+            }
+        }
+        this.expect("ON");
+        const targets = [];
+        do
+            targets.push(this.expr(["FROM"]));
+        while (this.acceptPunct(","));
+        this.expect("FROM");
+        const table = this.qualifiedName("a table name");
+        return { statement: "statistics", ifNotExists, name, kinds, targets, table };
+    }
+    foreignDataWrapper() {
+        const node = { statement: "foreignDataWrapper", name: this.databaseName("a foreign data wrapper name"), options: [] };
+        for (;;) {
+            if (this.accept("HANDLER"))
+                node.handler = this.qualifiedName("a handler function");
+            else if (this.acceptSeq("NO", "HANDLER"))
+                node.handler = null;
+            else if (this.accept("VALIDATOR"))
+                node.validator = this.qualifiedName("a validator function");
+            else if (this.acceptSeq("NO", "VALIDATOR"))
+                node.validator = null;
+            else if (this.accept("OPTIONS"))
+                node.options = this.genericOptions();
+            else
+                return node;
+        }
+    }
+    foreignServer() {
+        const ifNotExists = this.ifNotExists();
+        const name = this.databaseName("a server name");
+        const node = { statement: "foreignServer", ifNotExists, name, options: [] };
+        const string = (what) => {
+            const t = this.next();
+            if (t.kind !== "string" && t.kind !== "ref")
+                this.fail(`expected ${what} as a string`, t);
+            return this.span(this.idx(-1), t.kind === "ref" ? [t.part] : []);
+        };
+        if (this.accept("TYPE"))
+            node.type = string("the server type");
+        if (this.accept("VERSION"))
+            node.version = string("the server version");
+        if (!this.acceptSeq("FOREIGN", "DATA", "WRAPPER"))
+            this.fail("expected FOREIGN DATA WRAPPER (a server names the wrapper it is for)");
+        node.wrapper = this.qualifiedName("a foreign data wrapper name");
+        if (this.accept("OPTIONS"))
+            node.options = this.genericOptions();
+        return node;
+    }
+    publication() {
+        const node = { statement: "publication", name: this.databaseName("a publication name"), allTables: false, items: [], options: [] };
+        if (this.accept("FOR")) {
+            if (this.acceptSeq("ALL", "TABLES"))
+                node.allTables = true;
+            else {
+                let mode;
+                do {
+                    if (this.accept("TABLE"))
+                        mode = "table";
+                    else if (this.acceptSeq("TABLES", "IN", "SCHEMA"))
+                        mode = "schema";
+                    else if (mode === undefined)
+                        this.fail("expected ALL TABLES, TABLE or TABLES IN SCHEMA");
+                    if (mode === "schema") {
+                        node.items.push({ kind: "schema", schema: this.qualifiedName("a schema name") });
+                        continue;
+                    }
+                    this.accept("ONLY");
+                    const table = this.qualifiedName("a table name");
+                    if (this.isOp("*"))
+                        this.p++;
+                    const item = { kind: "table", table };
+                    if (this.isPunct("("))
+                        item.columns = this.nameList("a column name");
+                    if (this.accept("WHERE"))
+                        item.where = this.checkedParens();
+                    node.items.push(item);
+                } while (this.acceptPunct(","));
+            }
+        }
+        if (kw(this.peek(), "WITH") && this.isPunct("(", 1)) {
+            this.p++;
+            node.options = this.definition("a publication option");
+            this.checkDefinition(node.options, PUBLICATION_OPTIONS, [], "a publication");
+        }
+        return node;
+    }
     table(persistence) {
         const ifNotExists = this.ifNotExists();
         const node = { statement: "table", persistence, ifNotExists, name: this.qualifiedName("a table name"), columns: [], constraints: [], like: [] };
@@ -1747,6 +1924,21 @@ class PgParser extends SqlCursor {
                 node.text = this.commentText();
             return node;
         }
+        else if (this.acceptSeq("FOREIGN", "DATA", "WRAPPER")) {
+            objectType = "FOREIGN DATA WRAPPER";
+            target = this.qualifiedName("a foreign data wrapper name");
+        }
+        else if (this.accept("OPERATOR")) {
+            objectType = "OPERATOR";
+            target = this.operatorName();
+            if (!this.isPunct("("))
+                this.fail("expected '(' and the operator's operand types");
+            args = this.parenthesized();
+        }
+        else if (this.accept("SERVER", "PUBLICATION", "STATISTICS")) {
+            objectType = this.lastSeen().text.toUpperCase();
+            target = this.qualifiedName(`a ${objectType.toLowerCase()} name`);
+        }
         else if (this.accept("AGGREGATE", "COLLATION")) {
             objectType = this.lastSeen().text.toUpperCase();
             target = this.qualifiedName(`an ${objectType.toLowerCase()} name`);
@@ -1763,7 +1955,7 @@ class PgParser extends SqlCursor {
                 objectType = this.tokens[this.idx(-1)].text.toUpperCase();
             }
             else
-                return this.fail("expected TABLE, COLUMN, INDEX, VIEW, MATERIALIZED VIEW, SEQUENCE, TYPE, DOMAIN, SCHEMA, EXTENSION, FUNCTION, PROCEDURE, AGGREGATE, COLLATION, CAST, TRIGGER, EVENT TRIGGER, POLICY, ROLE or CONSTRAINT");
+                return this.fail("expected TABLE, COLUMN, INDEX, VIEW, MATERIALIZED VIEW, SEQUENCE, TYPE, DOMAIN, SCHEMA, EXTENSION, FUNCTION, PROCEDURE, AGGREGATE, COLLATION, CAST, OPERATOR, TRIGGER, EVENT TRIGGER, STATISTICS, FOREIGN DATA WRAPPER, SERVER, PUBLICATION, POLICY, ROLE or CONSTRAINT");
             target = this.qualifiedName("an object name");
             if ((objectType === "FUNCTION" || objectType === "PROCEDURE") && this.isPunct("("))
                 args = this.parenthesized();

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

@@ -1 +1 @@
-{"version":3,"file":"deep.d.ts","sourceRoot":"","sources":["../../../src/postgres/plan/deep.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAmB,KAAK,qBAAqB,EAAwD,MAAM,mCAAmC,CAAC;AAEtJ,OAAO,EAAyC,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AACvF,OAAO,EAA2B,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI7E,OAAO,EAAkD,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAMrG,KAAK,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AA2BrC,+EAA+E;AAC/E,wBAAgB,SAAS,CAAC,CAAC,EAAE,YAAY,GAAG,KAAK,CAGhD;AA2FD,uGAAuG;AACvG,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,iBAAiB,GAAG,KAAK,CAkEpH;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC,CAAC;CAC/E,GAAG,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,GACnC,OAAO,CAAC,qBAAqB,CAAC,CAyEhC"}
+{"version":3,"file":"deep.d.ts","sourceRoot":"","sources":["../../../src/postgres/plan/deep.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAmB,KAAK,qBAAqB,EAAwD,MAAM,mCAAmC,CAAC;AAEtJ,OAAO,EAAyC,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AACvF,OAAO,EAA2B,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI7E,OAAO,EAAkD,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAMrG,KAAK,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAgCrC,+EAA+E;AAC/E,wBAAgB,SAAS,CAAC,CAAC,EAAE,YAAY,GAAG,KAAK,CAGhD;AAuGD,uGAAuG;AACvG,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,iBAAiB,GAAG,KAAK,CA4EpH;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC,CAAC;CAC/E,GAAG,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,GACnC,OAAO,CAAC,qBAAqB,CAAC,CAyEhC"}

package/dist/postgres/plan/deep.js

@@ -37,6 +37,11 @@ const TAG = {
     [POSTGRES_ENTITY_TYPES.collation]: tags.collation,
     [POSTGRES_ENTITY_TYPES.cast]: tags.cast,
     [POSTGRES_ENTITY_TYPES.eventTrigger]: tags.eventTrigger,
+    [POSTGRES_ENTITY_TYPES.operator]: tags.operator,
+    [POSTGRES_ENTITY_TYPES.statistics]: tags.statistics,
+    [POSTGRES_ENTITY_TYPES.foreignDataWrapper]: tags.foreignDataWrapper,
+    [POSTGRES_ENTITY_TYPES.foreignServer]: tags.foreignServer,
+    [POSTGRES_ENTITY_TYPES.publication]: tags.publication,
     [POSTGRES_ENTITY_TYPES.extension]: tags.extension,
     [POSTGRES_ENTITY_TYPES.function]: tags.func,
     [POSTGRES_ENTITY_TYPES.procedure]: tags.procedure,
@@ -129,6 +134,18 @@ const PROP_OF_FIELD = {
     context: ["context"],
     event: ["event"],
     tags: ["tags"],
+    targets: ["targets"],
+    kinds: ["kinds"],
+    handler: ["handler", "handlerName", "noHandler"],
+    validator: ["validator", "validatorName", "noValidator"],
+    serverType: ["serverType"],
+    wrapper: ["wrapper", "wrapperName"],
+    allTables: ["allTables"],
+    tables: ["tables"],
+    schemas: ["schemas"],
+    publish: [],
+    viaRoot: [],
+    generatedColumns: [],
 };
 /** Props keys that hold constraints, by constraint kind. */
 const CONSTRAINT_PROPS = {
@@ -155,6 +172,9 @@ export function inDeclaredVocabulary(declared, live, d, l) {
     if (d.kind === "aggregate" && d.signature === l.signature)
         for (const key of ["args", "orderBy"])
             adopt(key);
+    if (d.kind === "operator" && d.signature === l.signature)
+        for (const key of ["leftArg", "rightArg"])
+            adopt(key);
     if (d.kind === "cast" && d.name === l.name)
         for (const key of ["sourceType", "targetType"])
             adopt(key);
@@ -195,7 +215,15 @@ export function inDeclaredVocabulary(declared, live, d, l) {
         ].map((c) => c.value);
     }
     // An aggregate's or a collation's `options` is the declaration's only when every field read from it is the same (a role's `options` shares the key).
-    const optionFields = d.kind === "aggregate" ? ["definition"] : d.kind === "collation" ? ["provider", "lcCollate", "lcCtype", "locale", "nondeterministic", "rules"] : undefined;
+    const optionFields = d.kind === "aggregate" || d.kind === "operator"
+        ? ["definition"]
+        : d.kind === "collation"
+            ? ["provider", "lcCollate", "lcCtype", "locale", "nondeterministic", "rules"]
+            : d.kind === "foreignDataWrapper" || d.kind === "foreignServer"
+                ? ["options"]
+                : d.kind === "publication"
+                    ? ["publish", "viaRoot", "generatedColumns"]
+                    : undefined;
     if (optionFields) {
         if (optionFields.every((f) => JSON.stringify(d.fields[f]) === JSON.stringify(l.fields[f])))
             adopt("options");

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;AA4OD;;;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;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"}

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"]);
+const REPLACED_KINDS = new Set(["composite", "range", "aggregate", "collation", "cast", "eventTrigger", "operator", "statistics"]);
 /** What each of {@link REPLACED_KINDS} compares besides its name and comment. */
 const DEFINITION = {
     composite: ["attributeDefs"],
@@ -210,7 +210,41 @@ const DEFINITION = {
     collation: ["provider", "lcCollate", "lcCtype", "locale", "nondeterministic", "rules"],
     cast: ["castMethod", "function", "context"],
     eventTrigger: ["event", "tags", "function"],
+    operator: ["definition"],
+    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. */
+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"] },
+};
+/**
+ * A foreign data wrapper's, foreign server's or publication's change: the
+ * comment and each field ALTER reaches in place (SQLPG303); a field it does
+ * not reach (a server's type and wrapper, a publication's FOR ALL TABLES) by
+ * dropping and creating the object (SQLPG300), refused while something
+ * depends on it (SQLPG301).
+ */
+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 replaced = recreate.filter((k) => !same(before.fields[k], after.fields[k]));
+    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("; ");
+        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` }));
+        }
+        else
+            out.push(change(key, replaced.join(", "), "SQLPG300", was, now));
+        return;
+    }
+    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])));
+}
 /**
  * A type's, aggregate's, collation's, cast's or event trigger's change: its
  * comment in place; its definition by CREATE OR REPLACE AGGREGATE where that
@@ -260,6 +294,10 @@ function diffObject(key, before, after, out, hints, major) {
         diffReplaced(key, before, after, out);
         return;
     }
+    if (after.kind in ALTERED_KINDS) {
+        diffAltered(key, before, after, out);
+        return;
+    }
     if (before.schema !== after.schema || before.name !== after.name) {
         out.push(change(key, "name", after.kind === "index" ? "SQLPG229" : "SQLPG228", qualified(before), qualified(after)));
     }

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

@@ -42,7 +42,7 @@
  * plan or a deep read has one (`./server-normalize.ts`). Offline, between two
  * builds, only the rules apply.
  */
-import type { AggregateProps, CastProps, RoutineProps } from "../entities.js";
+import type { OperatorProps, AggregateProps, CastProps, RoutineProps } from "../entities.js";
 /** The integer type a serial spelling stands for, or undefined for any other type. */
 export declare const serialBase: (type: string | undefined) => string | undefined;
 /** A qualified name in canonical form: each piece unquoted where it can be, the default schema added to a bare one. */
@@ -85,7 +85,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" | "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" | "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`). */
@@ -135,6 +135,21 @@ export declare const canonicalCollation: (text: string) => string;
 export declare function defaultMultirangeName(range: string): string;
 /** An aggregate's identity among its overloads: `(integer)`, `(*)`, `(text ORDER BY integer)`. */
 export declare function aggregateSignature(p: Pick<AggregateProps, "args" | "orderBy">, defaultSchema: string): string;
+/** An operator's identity among its overloads: its operand types, `(integer,integer)`, `NONE` for a missing side. */
+export declare function operatorSignature(p: Pick<OperatorProps, "leftArg" | "rightArg">, defaultSchema: string): string;
+/**
+ * An operator named where another object names it (a COMMUTATOR or NEGATOR):
+ * `OPERATOR(app.===)`, `app.===` or a bare symbol, which the server looks for
+ * in the new operator's own schema, as `schema.symbol`.
+ */
+export declare function canonicalOperatorRef(text: string, ownSchema: 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
+ * expression's own statistics); `pg_get_statisticsobjdef` prints the list only
+ * when it is not that default.
+ */
+export declare function statisticsKinds(kinds: readonly string[] | undefined, targets: readonly string[]): string[] | undefined;
 /** A cast's name, `(source AS target)`, its types canonical. */
 export declare const castName: (p: Pick<CastProps, "sourceType" | "targetType">, defaultSchema: string) => string;
 /**

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

@@ -303,6 +303,11 @@ const kindOf = {
     "Postgres::Collation": "collation",
     "Postgres::Cast": "cast",
     "Postgres::EventTrigger": "eventTrigger",
+    "Postgres::Operator": "operator",
+    "Postgres::Statistics": "statistics",
+    "Postgres::ForeignDataWrapper": "foreignDataWrapper",
+    "Postgres::ForeignServer": "foreignServer",
+    "Postgres::Publication": "publication",
     "Postgres::Extension": "extension",
     "Postgres::Function": "function",
     "Postgres::Procedure": "procedure",
@@ -524,7 +529,7 @@ function triggerFields(p, defaultSchema, fields) {
 }
 // ── Types, aggregates, collations, casts, event triggers (#3911) ──────
 /** The kinds that live in no schema. */
-const UNPLACED = new Set(["schema", "extension", "role", "cast", "eventTrigger"]);
+const UNPLACED = new Set(["schema", "extension", "role", "cast", "eventTrigger", "foreignDataWrapper", "foreignServer", "publication"]);
 /**
  * A function named where an object calls it (an aggregate's SFUNC, a cast's
  * or an event trigger's function), as the catalog's `regproc` prints it with
@@ -616,6 +621,77 @@ function collationFields(p, fields) {
     fields.nondeterministic = p.options.deterministic !== undefined && !isTrue(p.options.deterministic);
     fields.rules = o.rules;
 }
+/** An operator's identity among its overloads: its operand types, `(integer,integer)`, `NONE` for a missing side. */
+export function operatorSignature(p, defaultSchema) {
+    const side = (t) => (t === undefined ? "NONE" : canonicalArgType(t, defaultSchema));
+    return `(${side(p.leftArg)},${side(p.rightArg)})`;
+}
+/**
+ * An operator named where another object names it (a COMMUTATOR or NEGATOR):
+ * `OPERATOR(app.===)`, `app.===` or a bare symbol, which the server looks for
+ * in the new operator's own schema, as `schema.symbol`.
+ */
+export function canonicalOperatorRef(text, ownSchema) {
+    const inner = text.trim().replace(/^OPERATOR\s*\(\s*(.*?)\s*\)$/is, "$1");
+    const m = /^("(?:[^"]|"")+"|[A-Za-z_][A-Za-z0-9_$]*)\s*\.\s*(\S.*)$/s.exec(inner);
+    return `${quoteIdent(m ? identValue(m[1]) : ownSchema)}.${(m ? m[2] : inner).trim()}`;
+}
+/** An operator's definition as compared: each function and operator named canonically, a flag only when set. */
+function operatorOptions(p, ownSchema, defaultSchema) {
+    const out = {};
+    for (const [k, v] of Object.entries(p.options)) {
+        if (k === "function" || k === "restrict" || k === "join")
+            out[k] = canonicalFunctionName(v, defaultSchema);
+        else if (k === "commutator" || k === "negator")
+            out[k] = canonicalOperatorRef(v, ownSchema);
+        else if (k === "hashes" || k === "merges") {
+            if (isTrue(v))
+                out[k] = "true";
+        }
+        else
+            out[k] = defValue(v);
+    }
+    return Object.fromEntries(Object.entries(out).sort(([a], [b]) => (a < b ? -1 : 1)));
+}
+/** 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));
+    return entries.length > 0 ? Object.fromEntries(entries) : undefined;
+}
+const STATISTICS_ALL = ["dependencies", "mcv", "ndistinct"];
+/**
+ * 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
+ * expression's own statistics); `pg_get_statisticsobjdef` prints the list only
+ * when it is not that default.
+ */
+export function statisticsKinds(kinds, targets) {
+    if (kinds && kinds.length > 0) {
+        const sorted = [...new Set(kinds.map((k) => k.toLowerCase()))].sort();
+        return sorted.join() === STATISTICS_ALL.join() ? undefined : sorted;
+    }
+    const lone = targets.length === 1 && !/^"?[A-Za-z_][A-Za-z0-9_$]*"?$/.test(targets[0].trim());
+    return lone ? ["none"] : undefined;
+}
+/** Every action a publication publishes when `publish` is not given. */
+const PUBLISH_ALL = ["delete", "insert", "truncate", "update"];
+/** A publication as compared: its tables with their column lists and row filters, its schemas, and each option at its default left out. */
+function publicationFields(p, defaultSchema, fields) {
+    fields.allTables = p.allTables === true;
+    const tables = p.tables.map((t) => ({
+        table: canonicalName(t.tableName, defaultSchema),
+        ...(t.columns && t.columns.length > 0 ? { columns: [...t.columns].sort() } : {}),
+        ...(t.where ? { where: canonicalExpr(t.where) } : {}),
+    }));
+    fields.tables = tables.length > 0 ? tables.sort((a, b) => (a.table < b.table ? -1 : 1)) : undefined;
+    fields.schemas = p.schemas.length > 0 ? p.schemas.map((s) => quoteIdent(identValue(s))).sort() : undefined;
+    const o = p.options;
+    const publish = o.publish === undefined ? PUBLISH_ALL : [...new Set(defValue(o.publish).split(",").map((x) => x.trim().toLowerCase()).filter(Boolean))].sort();
+    fields.publish = publish.join() === PUBLISH_ALL.join() ? undefined : publish;
+    fields.viaRoot = isTrue(o.publish_via_partition_root);
+    const generated = o.publish_generated_columns === undefined ? "none" : defValue(o.publish_generated_columns);
+    fields.generatedColumns = generated === "none" ? undefined : generated;
+}
 /** A cast's name, `(source AS target)`, its types canonical. */
 export const castName = (p, defaultSchema) => `(${canonicalType(p.sourceType, defaultSchema)} AS ${canonicalType(p.targetType, defaultSchema)})`;
 /**
@@ -688,6 +764,38 @@ export function canonicalPgObject(entityType, props, defaultSchema = "public") {
             fields.function = canonicalFunctionName(p.functionName, defaultSchema);
             break;
         }
+        case "operator": {
+            const p = props;
+            base.signature = operatorSignature(p, defaultSchema);
+            fields.definition = operatorOptions(p, base.schema, defaultSchema);
+            break;
+        }
+        case "statistics": {
+            const p = props;
+            fields.table = canonicalName(p.tableName, defaultSchema);
+            const targets = p.targets.map((t) => canonicalExpr(t)).sort();
+            fields.targets = targets;
+            fields.kinds = statisticsKinds(p.kinds, p.targets);
+            break;
+        }
+        case "foreignDataWrapper": {
+            const p = props;
+            fields.handler = p.handlerName && !p.noHandler ? canonicalFunctionName(p.handlerName, defaultSchema) : undefined;
+            fields.validator = p.validatorName && !p.noValidator ? canonicalFunctionName(p.validatorName, defaultSchema) : undefined;
+            fields.options = sortedOptions(p.options);
+            break;
+        }
+        case "foreignServer": {
+            const p = props;
+            fields.serverType = p.serverType;
+            fields.version = p.version;
+            fields.wrapper = quoteIdent(identValue(p.wrapperName));
+            fields.options = sortedOptions(p.options);
+            break;
+        }
+        case "publication":
+            publicationFields(props, defaultSchema, fields);
+            break;
         case "function":
         case "procedure": {
             const p = props;

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

@@ -96,6 +96,7 @@ export declare const PG_CLASSIFIER_RULES: {
     readonly SQLPG300: PgClassifierRule;
     readonly SQLPG301: PgClassifierRule;
     readonly SQLPG302: PgClassifierRule;
+    readonly SQLPG303: 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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqUqB,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4UqB,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAAG,MAAM,OAAO,mBAAmB,CAAC"}

package/dist/postgres/plan/rules.js

@@ -108,8 +108,9 @@ 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 or event trigger", "A composite or range type's definition, a collation's, a cast's and an event trigger's have no ALTER, and an aggregate's argument types, state type and final function cannot be replaced: 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.", `${DOCS}/sql-createtype.html`),
-    SQLPG301: rule("SQLPG301", "expand", "Change a type, aggregate, collation or cast 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, 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`),
     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`),
     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")
+    if (kind === "collation" || kind === "cast" || kind === "eventTrigger" || kind === "operator" || kind === "statistics" || kind === "foreignDataWrapper" || kind === "foreignServer" || kind === "publication")
         return kind;
     if (kind === "grant" || kind === "defaultPrivileges")
         return "grant";

package/dist/postgres/secret-options.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Options that hold a credential. A foreign data wrapper's or server's
+ * `OPTIONS (...)` can carry any name, and a password in one would be written
+ * into a schema file by import and sent to every reader of the plan. The
+ * environment supplies credentials, in a user mapping (which is not declared)
+ * or its own secret store, as for a role's password (`./entities.ts`).
+ */
+/** Whether an option name reads as a credential: `password`, `sslpassword`, `secret_key`, `api_token`. */
+export declare const isSecretOption: (name: string) => boolean;
+//# sourceMappingURL=secret-options.d.ts.map

package/dist/postgres/secret-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"secret-options.d.ts","sourceRoot":"","sources":["../../src/postgres/secret-options.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,0GAA0G;AAC1G,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,KAAG,OAA2E,CAAC"}