okmodel 0.8.0 → 0.9.1

package/dist/shared/{dpc2r7rb.js → bdekbvmt.js}

@@ -3,25 +3,25 @@ import {
   renameColumn2,
   renameTable2
 } from "./12z7aznj.js";
+import {
+  quoteIdent2,
+  uniqueBeforeForeignKey2,
+  ownedByView2,
+  dropObjectSql2,
+  createObjectSql2,
+  functionSql2,
+  viewSql2,
+  policyCreatePlan2,
+  policyDropPlan2,
+  refreshMaterializedViewSql2,
+  alterColumnSql2,
+  identitySequence2,
+  createTableSql2,
+  qualify2
+} from "./fk9vef30.js";
 import {
   isConnectionLost
 } from "./cnkky55j.js";
-import {
-  quoteIdent,
-  uniqueBeforeForeignKey,
-  ownedByView,
-  dropObjectSql,
-  createObjectSql,
-  functionSql,
-  viewSql,
-  policyCreatePlan,
-  policyDropPlan,
-  refreshMaterializedViewSql,
-  alterColumnSql,
-  identitySequence,
-  createTableSql,
-  qualify
-} from "./sjk86yrx.js";
 import {
   isDomain,
   sameEnumLabels
@@ -47,6 +47,20 @@ import {
   OkmError2
 } from "./52szzakm.js";
 
+// src/tooling/migrate/driver-url.ts
+function driverUrl(url) {
+  let parsed;
+  try {
+    parsed = new URL(url);
+  } catch {
+    return url;
+  }
+  if (!parsed.searchParams.has("pgbouncer"))
+    return url;
+  parsed.searchParams.delete("pgbouncer");
+  return parsed.toString();
+}
+
 // src/tooling/migrate/sql-lex.ts
 function sqlStatements(sql) {
   return scan(sql).statements;
@@ -366,6 +380,67 @@ function isEscapeString(sql, index) {
     return false;
   return true;
 }
+function sqlIdentifiers(sql) {
+  const names = [];
+  let index = 0;
+  while (index < sql.length) {
+    if (sql.startsWith("--", index)) {
+      index = lineCommentEnd(sql, index + 2);
+      continue;
+    }
+    if (sql.startsWith("/*", index)) {
+      const block = blockComment(sql, index + 2);
+      index = block.index;
+      if (block.open)
+        break;
+      continue;
+    }
+    const dollar = dollarAt(sql, index);
+    if (dollar !== undefined) {
+      const closed = takeDollar(sql, dollar);
+      index = closed.index;
+      if (closed.open)
+        break;
+      continue;
+    }
+    if (isEscapeString(sql, index)) {
+      const quote = takeQuoted(sql, index + 2, true);
+      index = quote.index;
+      if (quote.open)
+        break;
+      continue;
+    }
+    const char = sql[index];
+    if (char === "'") {
+      const quote = takeQuoted(sql, index + 1, false);
+      index = quote.index;
+      if (quote.open)
+        break;
+      continue;
+    }
+    if (char === '"') {
+      const quote = takeIdent(sql, index + 1);
+      if (!quote.open) {
+        names.push({ text: unescapeIdent(sql.slice(index + 1, quote.index - 1)), quoted: true });
+      }
+      index = quote.index;
+      if (quote.open)
+        break;
+      continue;
+    }
+    if (isIdentStart(sql.charCodeAt(index))) {
+      const word = readWord(sql, index);
+      names.push({ text: word, quoted: false });
+      index += word.length;
+      continue;
+    }
+    index += 1;
+  }
+  return names;
+}
+function unescapeIdent(text) {
+  return text.replaceAll('""', '"');
+}
 function isIdentStart(code) {
   return code >= 65 && code <= 90 || code >= 97 && code <= 122 || code === 95;
 }
@@ -484,6 +559,9 @@ function privilegeSql(before, after, schema, recreated = new Set) {
       const tighten = tightenColumnSelect(object, after, schema);
       if (tighten !== undefined)
         grant.push(tighten);
+      const fromPublic = revokePublicExecute(object, schema);
+      if (fromPublic !== undefined)
+        grant.push(fromPublic);
       grant.push({ sql: grantStatement(object, schema, false), kind: "grant" });
       const writes = revokeMatviewWrites(object, after, schema);
       if (writes !== undefined)
@@ -493,6 +571,9 @@ function privilegeSql(before, after, schema, recreated = new Set) {
     if (previous !== undefined)
       continue;
     if (object.kind === "defaultPrivilege") {
+      const fromPublic = revokePublicDefaultExecute(object, schema);
+      if (fromPublic !== undefined)
+        defaults.push(fromPublic);
       defaults.push({ sql: defaultStatement(object, schema, false), kind: "grant-default" });
     }
   }
@@ -522,10 +603,10 @@ function index(objects) {
   return by;
 }
 function createRoleSql(object) {
-  return `create role ${quoteIdent(object.identity.name)} with nosuperuser nocreatedb nocreaterole ${inherit(object)} ${login(object)}`;
+  return `create role ${quoteIdent2(object.identity.name)} with nosuperuser nocreatedb nocreaterole ${inherit(object)} ${login(object)}`;
 }
 function alterRoleSql(object) {
-  return `alter role ${quoteIdent(object.identity.name)} with ${inherit(object)} ${login(object)}`;
+  return `alter role ${quoteIdent2(object.identity.name)} with ${inherit(object)} ${login(object)}`;
 }
 function login(object) {
   return object.definition.login ? "login" : "nologin";
@@ -541,10 +622,30 @@ function tightenColumnSelect(object, after, schema) {
   if (covered)
     return;
   return {
-    sql: `revoke select on ${grantTarget(target, schema)} from ${quoteIdent(object.identity.role)}`,
+    sql: `revoke select on ${grantTarget(target, schema)} from ${quoteIdent2(object.identity.role)}`,
     kind: "revoke"
   };
 }
+function revokePublicExecute(object, schema) {
+  if (object.identity.privilege.toUpperCase() !== "EXECUTE")
+    return;
+  if (object.identity.object.kind !== "function")
+    return;
+  return {
+    sql: `revoke execute on ${grantTarget(object.identity.object, schema)} from public`,
+    kind: "revoke"
+  };
+}
+function revokePublicDefaultExecute(object, schema) {
+  if (object.identity.objectKind !== "function")
+    return;
+  if (object.identity.privilege.toUpperCase() !== "EXECUTE")
+    return;
+  return {
+    sql: `alter default privileges for role ${quoteIdent2(object.identity.forRole)} in schema ${quoteIdent2(schema)} revoke execute on functions from public`,
+    kind: "grant-default"
+  };
+}
 function revokeMatviewWrites(object, after, schema) {
   if (object.identity.privilege.toUpperCase() !== "SELECT")
     return;
@@ -555,7 +656,7 @@ function revokeMatviewWrites(object, after, schema) {
   if (!inheritsWrites)
     return;
   return {
-    sql: `revoke insert, update, delete on ${grantTarget(target, schema)} from ${quoteIdent(object.identity.role)}`,
+    sql: `revoke insert, update, delete on ${grantTarget(target, schema)} from ${quoteIdent2(object.identity.role)}`,
     kind: "revoke"
   };
 }
@@ -565,11 +666,11 @@ function grantStatement(object, schema, revoke) {
   const verb = revoke ? "revoke" : "grant";
   const direction = revoke ? "from" : "to";
   const target = grantTarget(object.identity.object, schema);
-  const role = quoteIdent(object.identity.role);
+  const role = quoteIdent2(object.identity.role);
   const listed = column?.[2];
   const base = column?.[1];
   if (listed !== undefined && base !== undefined) {
-    const names = listed.split(",").filter((name) => name.length > 0).map((name) => quoteIdent(name)).join(", ");
+    const names = listed.split(",").filter((name) => name.length > 0).map((name) => quoteIdent2(name)).join(", ");
     return `${verb} ${base.toLowerCase()} (${names}) on ${target} ${direction} ${role}`;
   }
   const keyword = privilege.toLowerCase();
@@ -581,7 +682,7 @@ function defaultStatement(object, schema, revoke) {
   assertPrivilege(privilege);
   const verb = revoke ? "revoke" : "grant";
   const direction = revoke ? "from" : "to";
-  return `alter default privileges for role ${quoteIdent(object.identity.forRole)} in schema ${quoteIdent(schema)} ${verb} ${privilege} on ${objectKindSql(object.identity.objectKind)} ${direction} ${quoteIdent(object.identity.grantee)}`;
+  return `alter default privileges for role ${quoteIdent2(object.identity.forRole)} in schema ${quoteIdent2(schema)} ${verb} ${privilege} on ${objectKindSql(object.identity.objectKind)} ${direction} ${quoteIdent2(object.identity.grantee)}`;
 }
 function grantTargetKey(object) {
   if (object.kind === "table" || object.kind === "view" || object.kind === "materializedView" || object.kind === "sequence") {
@@ -603,20 +704,20 @@ function grantTargetKey(object) {
 }
 function grantTarget(object, schema) {
   if (object.kind === "sequence")
-    return `sequence ${qualify(schema, object.name)}`;
+    return `sequence ${qualify2(schema, object.name)}`;
   if (object.kind === "function")
     return functionTarget(object.name, schema);
   if (object.kind === "namespace")
-    return `schema ${quoteIdent(schema)}`;
-  return `table ${qualify(schema, object.name)}`;
+    return `schema ${quoteIdent2(schema)}`;
+  return `table ${qualify2(schema, object.name)}`;
 }
 function functionTarget(name, schema) {
   const open = name.lastIndexOf("(");
   if (open < 0 || !name.endsWith(")"))
-    return `function ${qualify(schema, name)}()`;
+    return `function ${qualify2(schema, name)}()`;
   const fn = name.slice(0, open);
   const args = name.slice(open + 1, -1);
-  return `function ${qualify(schema, fn)}(${args})`;
+  return `function ${qualify2(schema, fn)}(${args})`;
 }
 function objectKindSql(kind) {
   if (kind === "function")
@@ -713,7 +814,7 @@ function keyOn(source, table) {
     if (column === undefined || column.kind !== "column") {
       throw new OkmError2("OKM1546", `Table ${table} primary key column ${name} is not in the catalog.`, { fix: { summary: "Keep the primary key columns on the table." } });
     }
-    columns.push({ quoted: quoteIdent(name), dataType: column.definition.dataType });
+    columns.push({ quoted: quoteIdent2(name), dataType: column.definition.dataType });
   }
   if (columns.length === 0)
     return;
@@ -777,7 +878,7 @@ function splitKey(text) {
       }
       if (!closed)
         return [];
-      names.push(quoteIdent(value));
+      names.push(quoteIdent2(value));
       if (text[index] === ",")
         index += 1;
       continue;
@@ -787,7 +888,7 @@ function splitKey(text) {
     const raw = text.slice(index, end);
     if (raw.length === 0)
       return [];
-    names.push(quoteIdent(raw));
+    names.push(quoteIdent2(raw));
     index = comma === -1 ? text.length : comma + 1;
   }
   return names;
@@ -961,7 +1062,7 @@ function refuseDrops(beforeBy, afterBy, dropKeys) {
 }
 function alterExtension(before, after) {
   const steps = [];
-  const name = quoteIdent(after.identity.name);
+  const name = quoteIdent2(after.identity.name);
   if (before.definition.schema !== after.definition.schema) {
     if (!after.definition.relocatable) {
       throw new OkmError2("OKM1814", `Extension ${after.identity.name} is not relocatable, so it cannot move to ${after.definition.schema}.`, {
@@ -970,7 +1071,7 @@ function alterExtension(before, after) {
         }
       });
     }
-    steps.push(extensionStep(`alter extension ${name} set schema ${quoteIdent(after.definition.schema)}`, "move-extension"));
+    steps.push(extensionStep(`alter extension ${name} set schema ${quoteIdent2(after.definition.schema)}`, "move-extension"));
   }
   const previous = before.definition.version;
   const next = after.definition.version;
@@ -1151,9 +1252,9 @@ function stepsForExistingTable(object, schema, catalogs, batchSize) {
 function notNullSteps(column, schema, setKind, catalogs) {
   const tableName = column.identity.parent.name;
   const columnName = column.identity.name;
-  const table = qualify(schema, tableName);
-  const quotedColumn = quoteIdent(columnName);
-  const constraint = quoteIdent(notNullConstraintName(tableName, columnName, catalogs));
+  const table = qualify2(schema, tableName);
+  const quotedColumn = quoteIdent2(columnName);
+  const constraint = quoteIdent2(notNullConstraintName(tableName, columnName, catalogs));
   return [
     {
       sql: `alter table ${table} add constraint ${constraint} check (${quotedColumn} is not null) not valid`,
@@ -1216,7 +1317,7 @@ function volatileDefault(expression, catalogs) {
   return false;
 }
 function concurrentIndexStep(object, schema) {
-  const plain = createObjectSql(object, schema) ?? "";
+  const plain = createObjectSql2(object, schema) ?? "";
   return {
     sql: concurrentIndexSql(plain),
     kind: "create-index",
@@ -1232,13 +1333,13 @@ function constraintSteps(object, schema) {
   return notValidSteps(object, schema);
 }
 function notValidSteps(object, schema) {
-  const plain = createObjectSql(object, schema);
+  const plain = createObjectSql2(object, schema);
   if (plain === undefined)
     return [];
-  const table = qualify(schema, object.identity.parent.name);
-  const name = quoteIdent(object.identity.name);
+  const table = qualify2(schema, object.identity.parent.name);
+  const name = quoteIdent2(object.identity.name);
   const referenced = object.definition.references;
-  const referencedLock = referenced === undefined ? undefined : qualify(schema, referenced.parent.name);
+  const referencedLock = referenced === undefined ? undefined : qualify2(schema, referenced.parent.name);
   return [
     {
       sql: `${plain} not valid`,
@@ -1257,9 +1358,9 @@ function notValidSteps(object, schema) {
   ];
 }
 function usingIndexSteps(object, schema) {
-  const table = qualify(schema, object.identity.parent.name);
-  const name = quoteIdent(object.identity.name);
-  const columns = object.definition.columns.map((column) => quoteIdent(column)).join(", ");
+  const table = qualify2(schema, object.identity.parent.name);
+  const name = quoteIdent2(object.identity.name);
+  const columns = object.definition.columns.map((column) => quoteIdent2(column)).join(", ");
   const nulls = object.definition.nullsNotDistinct ? " nulls not distinct" : "";
   const verb = object.definition.constraintKind === "primaryKey" ? "primary key" : "unique";
   const defer = object.definition.deferrable ? ` deferrable initially ${object.definition.initially}` : "";
@@ -1282,9 +1383,9 @@ function usingIndexSteps(object, schema) {
 }
 function volatileColumnSteps(column, schema, catalogs, batchSize) {
   const tableName = column.identity.parent.name;
-  const table = qualify(schema, tableName);
-  const name = quoteIdent(column.identity.name);
-  const collate = column.definition.collation === undefined ? "" : ` collate ${quoteIdent(column.definition.collation)}`;
+  const table = qualify2(schema, tableName);
+  const name = quoteIdent2(column.identity.name);
+  const collate = column.definition.collation === undefined ? "" : ` collate ${quoteIdent2(column.definition.collation)}`;
   const expression = column.definition.defaultExpression ?? "";
   const key = primaryKeyColumns(catalogs, tableName);
   const backfill = {
@@ -1539,12 +1640,12 @@ function planMigration(input) {
   const deferred = new Set(picklists.map((change) => identityKey2(change.before.identity)));
   const typeDrops = [];
   const extensionDrops = [];
-  const reverse = [...uniqueBeforeForeignKey(creationOrder2(renamed))].reverse();
+  const reverse = [...uniqueBeforeForeignKey2(creationOrder2(renamed))].reverse();
   const emitDrop = (object) => {
     const key = identityKey2(object.identity);
     if (!dropKeys.has(key) || deferred.has(key) || covered(object, droppedTables))
       return;
-    const sql = dropObjectSql(object, schema);
+    const sql = dropObjectSql2(object, schema);
     const kind = dropKind(object);
     if (sql === undefined || kind === undefined)
       return;
@@ -1566,7 +1667,7 @@ function planMigration(input) {
     if (object.kind === "function")
       emitDrop(object);
   for (const object of reverse)
-    if (ownedByView(object))
+    if (ownedByView2(object))
       emitDrop(object);
   for (const object of reverse) {
     if (object.kind === "view" || object.kind === "materializedView")
@@ -1578,12 +1679,12 @@ function planMigration(input) {
     const key = identityKey2(object.identity);
     if (!dropKeys.has(key) || deferred.has(key))
       continue;
-    for (const item of policyDropPlan(object, schema)) {
+    for (const item of policyDropPlan2(object, schema)) {
       steps.push(step(item.sql, item.kind, "ddl", ACCESS2, true, [object.identity.parent.name]));
     }
   }
   for (const object of reverse) {
-    if (object.kind === "trigger" || object.kind === "function" || object.kind === "view" || object.kind === "materializedView" || object.kind === "policy" || ownedByView(object)) {
+    if (object.kind === "trigger" || object.kind === "function" || object.kind === "view" || object.kind === "materializedView" || object.kind === "policy" || ownedByView2(object)) {
       continue;
     }
     const key = identityKey2(object.identity);
@@ -1606,7 +1707,7 @@ function planMigration(input) {
   steps.push(...extensionAlterSteps(beforeBy, afterBy, dropKeys));
   for (const change of alters) {
     const aligned = alignedColumnType(change.before, change.after);
-    const statements = alterColumnSql(aligned, change.after, schema);
+    const statements = alterColumnSql2(aligned, change.after, schema);
     const kinds = columnAlterKinds(aligned, change.after);
     for (let index = 0;index < statements.length; index += 1) {
       const sql = statements[index];
@@ -1636,7 +1737,7 @@ function planMigration(input) {
     if (!createKeys.has(key) || emitted.has(key))
       continue;
     emitted.add(key);
-    const sql = createObjectSql(object, schema);
+    const sql = createObjectSql2(object, schema);
     const kind = createKind(object, false);
     if (sql === undefined || kind === undefined)
       continue;
@@ -1649,14 +1750,14 @@ function planMigration(input) {
     if (!createKeys.has(key) || emitted.has(key))
       continue;
     emitted.add(key);
-    const sql = createObjectSql(object, schema);
+    const sql = createObjectSql2(object, schema);
     const kind = createKind(object, false);
     if (sql === undefined || kind === undefined)
       continue;
     steps.push(step(sql, kind, "ddl", ACCESS2));
   }
-  for (const object of uniqueBeforeForeignKey(creationOrder2(request.after))) {
-    if (object.kind === "type" || object.kind === "extension" || object.kind === "function" || object.kind === "trigger" || object.kind === "view" || object.kind === "materializedView" || object.kind === "policy" || ownedByView(object)) {
+  for (const object of uniqueBeforeForeignKey2(creationOrder2(request.after))) {
+    if (object.kind === "type" || object.kind === "extension" || object.kind === "function" || object.kind === "trigger" || object.kind === "view" || object.kind === "materializedView" || object.kind === "policy" || ownedByView2(object)) {
       continue;
     }
     const key = identityKey2(object.identity);
@@ -1671,10 +1772,10 @@ function planMigration(input) {
       continue;
     emitted.add(key);
     if (object.kind === "table") {
-      steps.push(step(createTableSql(object, request.after, schema), "create-table", "ddl", ACCESS2));
+      steps.push(step(createTableSql2(object, request.after, schema), "create-table", "ddl", ACCESS2));
       continue;
     }
-    const sql = createObjectSql(object, schema);
+    const sql = createObjectSql2(object, schema);
     const kind = createKind(object, tableIsNew);
     if (sql === undefined || kind === undefined)
       continue;
@@ -1694,7 +1795,7 @@ function planMigration(input) {
     if (!createKeys.has(key) || emitted.has(key))
       continue;
     emitted.add(key);
-    for (const item of policyCreatePlan(object, schema)) {
+    for (const item of policyCreatePlan2(object, schema)) {
       steps.push(step(item.sql, item.kind, "ddl", ACCESS2, true, [object.identity.parent.name]));
     }
   }
@@ -1704,7 +1805,7 @@ function planMigration(input) {
     const key = identityKey2(change.after.identity);
     if (dropKeys.has(key) && createKeys.has(key))
       continue;
-    const sql = change.kind === "function" ? functionSql(change.after, schema, true) : viewSql(change.after, schema, true);
+    const sql = change.kind === "function" ? functionSql2(change.after, schema, true) : viewSql2(change.after, schema, true);
     const kind = change.kind === "function" ? "replace-function" : "replace-view";
     steps.push({
       sql,
@@ -1724,7 +1825,7 @@ function planMigration(input) {
       if (!createKeys.has(key) || emitted.has(key))
         continue;
       emitted.add(key);
-      const sql = createObjectSql(object, schema);
+      const sql = createObjectSql2(object, schema);
       const created = createKind(object, false);
       if (sql === undefined || created === undefined)
         continue;
@@ -1732,13 +1833,13 @@ function planMigration(input) {
     }
   }
   for (const object of creationOrder2(request.after)) {
-    if (!ownedByView(object))
+    if (!ownedByView2(object))
       continue;
     const key = identityKey2(object.identity);
     if (!createKeys.has(key) || emitted.has(key))
       continue;
     emitted.add(key);
-    const sql = createObjectSql(object, schema);
+    const sql = createObjectSql2(object, schema);
     const kind = createKind(object, false);
     if (sql === undefined || kind === undefined)
       continue;
@@ -1751,7 +1852,7 @@ function planMigration(input) {
     if (!createKeys.has(key))
       continue;
     assertConcurrentRefresh(object, request.after);
-    steps.push(step(refreshMaterializedViewSql(object, schema, false), "refresh-matview", "backfill", ACCESS2));
+    steps.push(step(refreshMaterializedViewSql2(object, schema, false), "refresh-matview", "backfill", ACCESS2));
   }
   for (const item of privileges.grant)
     steps.push(step(item.sql, item.kind, "ddl", ACCESS2));
@@ -1942,7 +2043,7 @@ function renameSteps(source, renames, schema) {
     if (rename.kind !== "table" || !hasTable(source, rename.from))
       continue;
     tables.set(rename.to, rename.from);
-    steps.push(step(`alter table ${qualify(schema, rename.from)} rename to ${quoteIdent(rename.to)}`, "rename-table", "ddl", ACCESS2));
+    steps.push(step(`alter table ${qualify2(schema, rename.from)} rename to ${quoteIdent2(rename.to)}`, "rename-table", "ddl", ACCESS2));
     steps.push(...sequenceRenames(source, rename, schema));
   }
   for (const rename of renames) {
@@ -1951,7 +2052,7 @@ function renameSteps(source, renames, schema) {
     const previousTable = tables.get(rename.table) ?? rename.table;
     if (!hasColumn(source, previousTable, rename.from))
       continue;
-    steps.push(step(`alter table ${qualify(schema, rename.table)} rename column ${quoteIdent(rename.from)} to ${quoteIdent(rename.to)}`, "rename-column", "ddl", ACCESS2));
+    steps.push(step(`alter table ${qualify2(schema, rename.table)} rename column ${quoteIdent2(rename.from)} to ${quoteIdent2(rename.to)}`, "rename-column", "ddl", ACCESS2));
   }
   return steps;
 }
@@ -1969,7 +2070,7 @@ function sequenceRenames(source, rename, schema) {
     const owned = source.objects.some((item) => item.kind === "sequence" && item.identity.name === fromName);
     if (!owned)
       continue;
-    steps.push(step(`alter sequence ${qualify(schema, fromName)} rename to ${quoteIdent(toName)}`, "rename-sequence", "ddl", ACCESS2));
+    steps.push(step(`alter sequence ${qualify2(schema, fromName)} rename to ${quoteIdent2(toName)}`, "rename-sequence", "ddl", ACCESS2));
   }
   return steps;
 }
@@ -2018,14 +2119,14 @@ function withoutNameKey(value) {
 }
 function renameShapeStep(pair, schema) {
   if (pair.from.kind === "index" && pair.to.kind === "index") {
-    return step(`alter index ${qualify(schema, pair.from.identity.name)} rename to ${quoteIdent(pair.to.identity.name)}`, "rename-index", "ddl", SHARE_UPDATE2);
+    return step(`alter index ${qualify2(schema, pair.from.identity.name)} rename to ${quoteIdent2(pair.to.identity.name)}`, "rename-index", "ddl", SHARE_UPDATE2);
   }
   if (pair.from.kind !== "constraint" || pair.to.kind !== "constraint") {
     throw new OkmError2("invalid", "A same-shape rename is an index or a constraint.", {
       fix: { summary: "The planner only renames an index or a constraint in place." }
     });
   }
-  return step(`alter table ${qualify(schema, pair.from.identity.parent.name)} rename constraint ${quoteIdent(pair.from.identity.name)} to ${quoteIdent(pair.to.identity.name)}`, "rename-constraint", "ddl", ACCESS2);
+  return step(`alter table ${qualify2(schema, pair.from.identity.parent.name)} rename constraint ${quoteIdent2(pair.from.identity.name)} to ${quoteIdent2(pair.to.identity.name)}`, "rename-constraint", "ddl", ACCESS2);
 }
 function assertUnambiguous(beforeBy, afterBy) {
   const dropped = new Map;
@@ -2211,8 +2312,8 @@ function contractSwaps(picklists, enums, replacements, schema, catalogs, batchSi
   const steps = [];
   steps.push(...dataSteps(picklists, enums, replacements, schema, catalogs, batchSize, "contract"));
   for (const change of picklists) {
-    const table = qualify(schema, change.after.identity.parent.name);
-    const name = quoteIdent(change.after.identity.name);
+    const table = qualify2(schema, change.after.identity.parent.name);
+    const name = quoteIdent2(change.after.identity.name);
     const kind = change.removed.length > 0 ? "narrow-check" : "widen-check";
     steps.push(step(`alter table ${table} drop constraint ${name}`, kind, "ddl", ACCESS2));
     const expression = change.after.definition.expression ?? "true";
@@ -2222,17 +2323,17 @@ function contractSwaps(picklists, enums, replacements, schema, catalogs, batchSi
   for (const change of enums) {
     if (change.kind !== "replace")
       continue;
-    const type = qualify(schema, change.name);
-    const old = quoteIdent(`${change.name}_old`);
+    const type = qualify2(schema, change.name);
+    const old = quoteIdent2(`${change.name}_old`);
     const labels = change.labels.map((label) => quoteLiteral(label)).join(", ");
     steps.push(step(`alter type ${type} rename to ${old}`, "rename-enum", "ddl", ACCESS2));
     steps.push(step(`create type ${type} as enum (${labels})`, "recreate-enum", "ddl", ACCESS2));
     for (const column of change.columns) {
-      const table = qualify(schema, column.table);
-      const name = quoteIdent(column.column);
+      const table = qualify2(schema, column.table);
+      const name = quoteIdent2(column.column);
       steps.push(step(`alter table ${table} alter column ${name} type ${type} using ${name}::text::${type}`, "set-enum-column", "ddl", ACCESS2));
     }
-    steps.push(step(`drop type ${qualify(schema, `${change.name}_old`)}`, "drop-enum", "ddl", ACCESS2));
+    steps.push(step(`drop type ${qualify2(schema, `${change.name}_old`)}`, "drop-enum", "ddl", ACCESS2));
   }
   return steps;
 }
@@ -2376,9 +2477,9 @@ function domainCheckSteps(beforeBy, afterBy, schema) {
     if (previous.definition.check === next.definition.check)
       continue;
     const name = next.identity.name;
-    const type = qualify(schema, name);
-    const current = quoteIdent(fitIdentifier2(`${name}_check`));
-    const upcoming = quoteIdent(fitIdentifier2(`${name}_check_next`));
+    const type = qualify2(schema, name);
+    const current = quoteIdent2(fitIdentifier2(`${name}_check`));
+    const upcoming = quoteIdent2(fitIdentifier2(`${name}_check_next`));
     const expression = next.definition.check;
     steps.push(step(`alter domain ${type} add constraint ${upcoming} check (${expression}) not valid`, "add-domain-check", "ddl", ACCESS2));
     steps.push(step(`alter domain ${type} validate constraint ${upcoming}`, "validate-domain-check", "ddl", ACCESS2));
@@ -2454,7 +2555,7 @@ function labelSubsequence(before, after) {
 function addValueStatements(schema, name, before, after) {
   const present = new Set(before);
   const statements = [];
-  const type = qualify(schema, name);
+  const type = qualify2(schema, name);
   for (let index = 0;index < after.length; index += 1) {
     const label = after[index];
     if (label === undefined || present.has(label))
@@ -2538,8 +2639,8 @@ function columnAlterable(before, after) {
 function identityChangeSql(before, after, schema) {
   if (stable(before.definition.identity) === stable(after.definition.identity))
     return;
-  const table = qualify(schema, after.identity.parent.name);
-  const name = quoteIdent(after.identity.name);
+  const table = qualify2(schema, after.identity.parent.name);
+  const name = quoteIdent2(after.identity.name);
   const next = after.definition.identity;
   const previous = before.definition.identity;
   if (next === undefined)
@@ -2683,7 +2784,7 @@ function folded(object, source) {
     return true;
   if (object.kind !== "sequence")
     return false;
-  if (identitySequence(object, source))
+  if (identitySequence2(object, source))
     return true;
   const name = object.identity.name;
   return source.objects.some((column) => {
@@ -2703,9 +2804,9 @@ function overall(steps) {
 }
 function updateSql(schema, table, column, from, to, catalogs, batchSize, cast = false) {
   const key = primaryKeyColumns(catalogs, table);
-  const qualified = qualify(schema, table);
+  const qualified = qualify2(schema, table);
   const value = to === null ? "null" : quoteLiteral(to);
-  const compare = cast ? `${quoteIdent(column)}::text` : quoteIdent(column);
+  const compare = cast ? `${quoteIdent2(column)}::text` : quoteIdent2(column);
   const where = `${compare} = ${quoteLiteral(from)}`;
   const backfill = {
     table: qualified,
@@ -2713,7 +2814,7 @@ function updateSql(schema, table, column, from, to, catalogs, batchSize, cast =
     batch: batchSize
   };
   return {
-    sql: `update ${qualified} set ${quoteIdent(column)} = ${value} where ${where} and ${keyRangePredicate(key)}`,
+    sql: `update ${qualified} set ${quoteIdent2(column)} = ${value} where ${where} and ${keyRangePredicate(key)}`,
     backfill
   };
 }
@@ -2804,7 +2905,7 @@ function readIdent(text, start) {
   return;
 }
 function pushDrop(steps, object, schema) {
-  const sql = dropObjectSql(object, schema);
+  const sql = dropObjectSql2(object, schema);
   const kind = dropKind(object);
   if (sql === undefined || kind === undefined)
     return;
@@ -3021,14 +3122,36 @@ function assertDirectConnection(url, allowPooler) {
     throw new OkmError2("invalid", `Refusing pooler host ${host}. Apply needs a direct connection.`, { fix: { summary: "Use a direct connection, or pass --allow-pooler." } });
   }
 }
-async function assertStableBackend(readPid, allowPooler) {
+async function assertStableBackend(readPid, allowPooler, options) {
   if (allowPooler)
     return;
-  const first = await readPid();
-  const second = await readPid();
-  if (first === second)
-    return;
-  throw new OkmError2("OKM1854", `The backend pid changed from ${first} to ${second}. A pooler is handing out a new session between statements.`, { fix: { summary: "Use a direct connection, or pass --allow-pooler." } });
+  const seen = new Set;
+  let first = "";
+  let release;
+  try {
+    for (let i = 0;i < 8; i += 1) {
+      const pid = await readPid();
+      if (first.length === 0)
+        first = pid;
+      seen.add(pid);
+      if (seen.size >= 2) {
+        const second = [...seen].find((value) => value !== first) ?? pid;
+        throw new OkmError2("OKM1854", `The backend pid changed from ${first} to ${second}. A pooler is handing out a new session between statements.`, { fix: { summary: "Use a direct connection, or pass --allow-pooler." } });
+      }
+      if (release !== undefined) {
+        await release();
+        release = undefined;
+      }
+      if (i < 7 && options?.holdBackend !== undefined) {
+        release = await options.holdBackend();
+      }
+    }
+  } finally {
+    if (release !== undefined)
+      await release().catch(() => {
+        return;
+      });
+  }
 }
 function listTargets(config) {
   if (config.database !== undefined && config.targets !== undefined) {
@@ -3118,4 +3241,4 @@ function endpointOf(url) {
   };
 }
 
-export { sqlStatements, transactionControl, canonicalTypeName, prepareMigrationText, assertMigrationSteps, columnPrivilege, createdRoleName, createRoleOnce, changesRole, DEFAULT_BACKFILL_PAUSE_MS, DEFAULT_BACKFILL_STATEMENT_TIMEOUT_MS, batchSizeField, aboutBatchCount, boundaryQuery, checkedCast, classOf, strictestClass, assertExtensionsAvailable, omitManagedObjects, parseReplace, planMigration, formatPlan, parsePlan, staleRenames, sessionFailure, finishQuiet, assertTargetPolicy, assertTargetAlias, assertDirectConnection, assertStableBackend, listTargets, selectTarget };
+export { driverUrl, sqlStatements, transactionControl, sqlIdentifiers, canonicalTypeName, prepareMigrationText, assertMigrationSteps, columnPrivilege, createdRoleName, createRoleOnce, changesRole, DEFAULT_BACKFILL_PAUSE_MS, DEFAULT_BACKFILL_STATEMENT_TIMEOUT_MS, batchSizeField, aboutBatchCount, boundaryQuery, checkedCast, classOf, strictestClass, assertExtensionsAvailable, omitManagedObjects, parseReplace, planMigration, formatPlan, parsePlan, staleRenames, sessionFailure, finishQuiet, assertTargetPolicy, assertTargetAlias, assertDirectConnection, assertStableBackend, listTargets, selectTarget };