okmodel 0.4.0 → 0.5.1

package/dist/shared/{41kv2xdm.js → 8xsbagad.js}

@@ -1,6 +1,6 @@
 import {
   creationOrder2
-} from "./8jb4ymh2.js";
+} from "./8bwbwy8h.js";
 import {
   isDomain
 } from "./g7ez901n.js";

package/dist/shared/{6p5k20sm.js → 96qcj21c.js}

@@ -3,14 +3,14 @@ import {
   noticeBuffer,
   WireSession,
   cursorStream
-} from "./zvbjc949.js";
+} from "./4az561fn.js";
 import {
   NODE_POSTGRES_CAPABILITIES,
   driverErrors,
   rejectClosed,
   mapFailure,
   runCall
-} from "./rrstp3kb.js";
+} from "./cgbamx3e.js";
 
 // src/adapters/pg/nodepostgres.ts
 import net from "node:net";
@@ -53,7 +53,7 @@ function open4(config) {
     counters.busy = Math.max(0, counters.busy - 1);
   }, inflight);
   const held = { pool, acquireMs, counters, notices, named, isClosed };
-  const checkout = () => closed ? rejectClosed() : import("./fb00y8fp.js").then((mod) => mod.checkout(held));
+  const checkout = () => closed ? rejectClosed() : import("./r8x5qhd7.js").then((mod) => mod.checkout(held));
   return {
     capabilities: NODE_POSTGRES_CAPABILITIES,
     execute(text, params, options) {

package/dist/shared/{jgxzjzcz.js → aj2qxyhj.js}

@@ -4,12 +4,12 @@ import {
 import {
   withHttp,
   settleCall
-} from "./kkzwp3d2.js";
+} from "./hf22e0wt.js";
 import {
   rejectKeys,
   isRecord,
   fail
-} from "./xrfnq5k8.js";
+} from "./gbtcc2d7.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{5vdm4sgp.js → caw8b9d8.js}

@@ -1,9 +1,9 @@
 import {
   PgSession
-} from "./wqem4jed.js";
+} from "./krxx77g0.js";
 import {
   isConnectionLost
-} from "./tbszx8mz.js";
+} from "./pf0d8f77.js";
 import {
   driverErrors,
   rejectClosed,
@@ -11,7 +11,7 @@ import {
   runCall,
   rowsFrom,
   resultFrom
-} from "./rrstp3kb.js";
+} from "./cgbamx3e.js";
 
 // src/adapters/pg/postgres-extra.ts
 var RESET_ALL = "RESET ALL";
@@ -33,7 +33,7 @@ async function checkout(pool) {
   return {
     execute: (text, params, options) => guard(() => runCall(pool.isClosed(), options, (watch) => session.query(text, params, watch))),
     batch: (statements, options) => guard(() => runCall(pool.isClosed(), options, async (watch) => {
-      const { runAtomicBatch } = await import("./b066g80h.js");
+      const { runAtomicBatch } = await import("./efmy2gcg.js");
       return runAtomicBatch(session, statements, watch);
     })),
     cancel() {

package/dist/shared/{s4mb6a4b.js → cctw17hj.js}

@@ -1,9 +1,9 @@
 import {
   open2
-} from "./wqem4jed.js";
+} from "./krxx77g0.js";
 import {
-  catalogHash2
-} from "./8jb4ymh2.js";
+  startupHash2
+} from "./8bwbwy8h.js";
 import {
   runTarget,
   assumeRole,
@@ -15,29 +15,30 @@ import {
   provisionMark,
   expandProvisioned,
   installSnapshot
-} from "./7nk68fj8.js";
+} from "./gde73es6.js";
 import {
   assertCreateRole,
   currentUser,
   roleExists
-} from "./hcmdtwgh.js";
+} from "./szm0cksa.js";
 import {
   lintMigrationDirectory,
   hasError,
   lintRefusal,
-  assertTargetPolicy,
-  assertDirectConnection,
-  selectTarget,
   projectHead,
   loadBuiltSchema,
   loadConfig
-} from "./q6zsyh31.js";
+} from "./qv2ydck9.js";
 import {
   changesRole,
   batchSizeField,
   assertExtensionsAvailable,
-  planMigration
-} from "./n5y9zyj1.js";
+  planMigration,
+  assertTargetPolicy,
+  assertDirectConnection,
+  assertStableBackend,
+  selectTarget
+} from "./ga3sfy93.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -177,6 +178,8 @@ async function applyTarget2(request) {
   const connection = await pool.reserve();
   let locked = false;
   try {
+    await assertStableBackend(() => backendPid(connection), request.allowPooler === true);
+    await assertStandardStrings(connection);
     await setTimeouts(connection, request);
     await lockTarget(connection, request.target);
     locked = true;
@@ -202,6 +205,7 @@ async function applyTarget2(request) {
     await connection.execute(META);
     await connection.execute(HISTORY);
     await connection.execute(BACKFILL);
+    const restamped = await restampLegacy(connection, request);
     const history = await readHistory(connection);
     const done = expandProvisioned(request.migrations, history.done, history.ids);
     const units = request.migrations.flatMap((migration) => applyUnits(migration, done));
@@ -221,7 +225,7 @@ async function applyTarget2(request) {
     if (request.snapshot !== undefined) {
       await insertReference(connection, request);
     }
-    return report;
+    return restamped.length === 0 ? report : { ...report, restamped };
   } finally {
     if (locked)
       await connection.execute("select pg_advisory_unlock(hashtext($1))", [
@@ -306,7 +310,7 @@ no changes
     migrations: [
       {
         id: "push",
-        catalogHash: catalogHash2(head.catalog),
+        catalogHash: startupHash2(head.catalog),
         steps: plan.steps
       }
     ],
@@ -323,18 +327,73 @@ function backfillTiming2(backfill) {
 function formatReport(report) {
   const role = report.setRole !== undefined ? `set role ${report.setRole}
 ` : "";
+  const restamped = (report.restamped ?? []).map((id) => `restamped ${id}
+`).join("");
   if (report.applied.length === 0)
     return `target ${report.target}
-${role}nothing to apply
+${role}${restamped}nothing to apply
 `;
   return `target ${report.target}
-${role}${report.applied.map((id) => `applied ${id}`).join(`
+${role}${restamped}${report.applied.map((id) => `applied ${id}`).join(`
 `)}
 `;
 }
+async function restampLegacy(connection, request) {
+  const pairs = [];
+  for (const migration of request.migrations) {
+    if (migration.legacyHash === undefined)
+      continue;
+    pairs.push({
+      id: migration.id,
+      mark: provisionMark(migration.id),
+      legacy: migration.legacyHash,
+      startup: migration.catalogHash
+    });
+  }
+  if (pairs.length === 0)
+    return [];
+  await connection.execute("begin");
+  try {
+    const result = await connection.execute(RESTAMP, [JSON.stringify(pairs)]);
+    const restamped = result.rows.flatMap((row) => typeof row[0] === "string" ? [row[0]] : []);
+    if (restamped.length > 0) {
+      assertTargetPolicy({ name: request.target, protected: request.protected }, "history-repair", request.allowProtected === true);
+    }
+    await connection.execute("commit");
+    return restamped;
+  } catch (error) {
+    await connection.execute("rollback");
+    throw error;
+  }
+}
+var RESTAMP = `with pairs as (
+  select * from json_to_recordset($1::json) as p(id text, mark text, legacy text, startup text)
+), history as (
+  update okm_history h set catalog_hash = p.startup from pairs p
+   where h.migration_id in (p.id, p.mark) and h.catalog_hash = p.legacy
+  returning p.id, h.migration_id
+), meta as (
+  update okm_meta m set catalog_hash = p.startup from pairs p
+   where m.id = 'head' and m.migration_id in (p.id, p.mark) and m.catalog_hash = p.legacy
+     and m.migration_id in (select migration_id from history)
+  returning m.id
+)
+select distinct id from history order by id`;
 function joinMigrations(cwd, migrations) {
   return join(cwd, migrations ?? "migrations");
 }
+async function backendPid(connection) {
+  const result = await connection.execute("select pg_backend_pid()::text");
+  const cell = result.rows[0]?.[0];
+  return cell === null || cell === undefined ? "" : String(cell);
+}
+async function assertStandardStrings(connection) {
+  const result = await connection.execute("show standard_conforming_strings");
+  const value = result.rows[0]?.[0];
+  if (value === "on")
+    return;
+  throw new OkmError2("invalid", `standard_conforming_strings is ${value === null || value === undefined ? "off" : String(value)}. Apply refuses to run.`, { fix: { summary: "Turn standard_conforming_strings on for this database." } });
+}
 async function setTimeouts(connection, request) {
   const lock = request.lockTimeoutMs ?? DEFAULT_LOCK_MS;
   const statement = request.statementTimeoutMs ?? DEFAULT_STATEMENT_MS;

package/dist/shared/{rrstp3kb.js → cgbamx3e.js}

@@ -41,7 +41,7 @@ function hasCapability2(flags, name) {
 // src/adapters/failure.ts
 var loading;
 function driverErrors() {
-  loading ??= import("./7p2wbz7f.js");
+  loading ??= import("./x72jb7ad.js");
   return loading;
 }
 function rejectClosed(message = "The pool is closed.") {
@@ -83,7 +83,7 @@ function runCall(closed, options, fn) {
   if (options === undefined || !needsWatch(options))
     return fn(undefined);
   const watched = options;
-  return import("./k3ted12y.js").then(({ openWatch }) => {
+  return import("./54tqkxja.js").then(({ openWatch }) => {
     const watch = openWatch(watched);
     return fn(watch).finally(() => {
       watch.finish();

package/dist/shared/{axhk06q1.js → cr74e96e.js}

@@ -11,7 +11,7 @@ import {
   quote,
   isRecord,
   fail
-} from "./xrfnq5k8.js";
+} from "./gbtcc2d7.js";
 import {
   isOperator,
   operatorName,

package/dist/shared/{b066g80h.js → efmy2gcg.js}

@@ -2,10 +2,10 @@ import {
   DriverError2,
   outcomeUnknown2,
   mapDriverError2
-} from "./kyxb62mc.js";
+} from "./31vm914h.js";
 import {
   isConnectionLost
-} from "./tbszx8mz.js";
+} from "./pf0d8f77.js";
 
 // src/adapters/pg/batch.ts
 var savepointIds = 0;

package/dist/shared/{gdh9mrtp.js → f5cw5q5r.js}

@@ -1,11 +1,11 @@
 import {
   open3
-} from "./fa9vt245.js";
+} from "./87jvvhnt.js";
 import {
   PGLITE_CAPABILITIES,
   readCapability2,
   hasCapability2
-} from "./rrstp3kb.js";
+} from "./cgbamx3e.js";
 export {
   PGLITE_CAPABILITIES as capabilities,
   hasCapability2 as hasCapability,

package/dist/shared/{xghkt7a9.js → fancm5pt.js}

@@ -2,14 +2,10 @@ import {
   roleObject,
   grantObject,
   defaultPrivilegeObject
-} from "./8jb4ymh2.js";
+} from "./8bwbwy8h.js";
 import {
-  planMigration
-} from "./n5y9zyj1.js";
-import {
-  quoteIdent,
-  createObjectSql
-} from "./41kv2xdm.js";
+  quoteIdent
+} from "./8xsbagad.js";
 import {
   functionObject,
   triggerObject
@@ -40,12 +36,6 @@ import {
 import {
   referentialAction
 } from "./4e4c6vq2.js";
-import {
-  OkmError2
-} from "./52szzakm.js";
-
-// src/tooling/migrate/drift.ts
-import postgres from "postgres";
 
 // src/dialects/pg/view/depend.ts
 function cellText(value) {
@@ -446,8 +436,9 @@ var RELATION_GRANTS = `select c.relname as name,
       select 1 from pg_depend d
       where d.classid = 'pg_class'::regclass and d.objid = c.oid and d.deptype = 'e'
     )`;
+var FUNCTION_ARG_TYPES = "replace(oidvectortypes(p.proargtypes), ' ', '')";
 var FUNCTION_GRANTS = `select p.proname as name,
-  replace(pg_get_function_identity_arguments(p.oid), ' ', '') as args,
+  ${FUNCTION_ARG_TYPES} as args,
   r.rolname as role, a.privilege_type as privilege
   from pg_proc p
   join pg_namespace n on n.oid = p.pronamespace
@@ -923,222 +914,4 @@ function flag(row, key) {
   return value === true || value === "true" || value === "t";
 }
 
-// src/dialects/pg/view/scratch.ts
-var SCRATCH = "okm_view_seal";
-var VIEW_SHAPE = `
-  select c.relname as name, c.relkind as kind, pg_get_viewdef(c.oid, true) as query,
-    (
-      select coalesce(string_agg(
-        a.attname || '|' || format_type(a.atttypid, a.atttypmod),
-        E'\\n' order by a.attnum
-      ), '')
-      from pg_attribute a
-      where a.attrelid = c.oid and a.attnum > 0 and not a.attisdropped
-    ) as columns
-  from pg_class c
-  join pg_namespace n on n.oid = c.relnamespace
-  where n.nspname = $1 and c.relkind in ('v', 'm')
-`;
-async function sealViews(runner, source) {
-  const views = source.objects.filter((object) => object.kind === "view" || object.kind === "materializedView");
-  if (views.length === 0)
-    return source;
-  await dropScratch(runner);
-  await runner.query(`create schema ${quoteIdent(SCRATCH)}`);
-  try {
-    await runner.query(`set search_path to ${quoteIdent(SCRATCH)}`);
-    for (const object of source.objects) {
-      if (object.kind !== "type")
-        continue;
-      const statement = createObjectSql(object, SCRATCH);
-      if (statement !== undefined)
-        await runner.query(statement);
-    }
-    for (const object of source.objects) {
-      if (object.kind !== "table")
-        continue;
-      await runner.query(stubTable(object, source));
-    }
-    await createViews(runner, views);
-    const shapes = await runner.query(VIEW_SHAPE, [SCRATCH]);
-    const deps = await runner.query(VIEW_DEPENDENCIES, [SCRATCH]);
-    const edges = viewDependencyEdges(deps, PUBLIC, source.objects);
-    const byName = new Map(shapes.map((row) => [cellText(row.name), row]));
-    const next = source.objects.map((object) => {
-      if (object.kind !== "view" && object.kind !== "materializedView")
-        return object;
-      const row = byName.get(object.identity.name);
-      if (row === undefined) {
-        throw new OkmError2("OKM1020", `View ${object.identity.name} was not created in the scratch schema.`, {
-          fix: { summary: "The query has to run against the tables in this schema." }
-        });
-      }
-      const columns = readColumns(object, cellText(row.columns));
-      const query = normaliseViewQuery(cellText(row.query));
-      const dependencies = edges.get(object.identity.name) ?? [];
-      if (object.kind === "view") {
-        return viewObject({
-          namespace: object.identity.namespace,
-          name: object.identity.name,
-          columns,
-          query,
-          owner: object.owner,
-          provenance: object.provenance,
-          dependencies
-        });
-      }
-      return materializedViewObject({
-        namespace: object.identity.namespace,
-        name: object.identity.name,
-        columns,
-        query,
-        owner: object.owner,
-        provenance: object.provenance,
-        dependencies,
-        ...object.definition.refresh !== undefined ? { refresh: object.definition.refresh } : {}
-      });
-    });
-    return catalog(next);
-  } finally {
-    await runner.query("set search_path to public");
-    await dropScratch(runner);
-  }
-}
-async function createViews(runner, views) {
-  const pending = [...views];
-  let last = "";
-  for (let pass = 0;pass < views.length && pending.length > 0; pass += 1) {
-    const failed = [];
-    let created = 0;
-    for (const object of pending) {
-      const sql = object.kind === "materializedView" ? `create materialized view ${quoteIdent(object.identity.name)} as ${object.definition.query} with no data` : `create view ${quoteIdent(object.identity.name)} as ${object.definition.query}`;
-      try {
-        await runner.query(sql);
-        created += 1;
-      } catch (error) {
-        last = error instanceof Error ? error.message : String(error);
-        failed.push(object);
-      }
-    }
-    if (created === 0) {
-      throw new OkmError2("OKM1020", `View ${failed[0]?.identity.name ?? ""} could not be created. ${last}`, {
-        fix: { summary: "The query has to run against the tables in this schema." }
-      });
-    }
-    pending.length = 0;
-    pending.push(...failed);
-  }
-}
-function stubTable(object, source) {
-  const columns = source.objects.filter((item) => item.kind === "column" && item.identity.parent.name === object.identity.name);
-  const lines = columns.map((column) => `${quoteIdent(column.identity.name)} ${column.definition.dataType}`);
-  return `create table ${quoteIdent(object.identity.name)} (${lines.join(", ")})`;
-}
-function readColumns(object, printed) {
-  const live = printed.length === 0 ? [] : printed.split(`
-`);
-  const declared = object.definition.columns;
-  if (live.length !== declared.length) {
-    throw mismatch(object.identity.name, declared.map((column) => column.name).join(", "), printed);
-  }
-  return declared.map((column, index) => {
-    const line = live[index] ?? "";
-    const splitAt = line.indexOf("|");
-    const name = splitAt < 0 ? line : line.slice(0, splitAt);
-    const type = splitAt < 0 ? "" : line.slice(splitAt + 1);
-    if (name !== column.name || type !== column.dataType) {
-      throw mismatch(object.identity.name, `${column.name}:${column.dataType}`, live[index] ?? "");
-    }
-    return column;
-  });
-}
-function mismatch(view, declared, live) {
-  return new OkmError2("OKM1020", `View ${view} declares ${declared} and the database has ${live}.`, { fix: { summary: "Declare the columns the query returns, in that order, with those types." } });
-}
-async function dropScratch(runner) {
-  const present = await runner.query(`select 1 as ok from pg_namespace where nspname = $1`, [
-    SCRATCH
-  ]);
-  if (present.length === 0)
-    return;
-  const rows = await runner.query(`
-    select c.relname as name, c.relkind as kind
-    from pg_class c
-    join pg_namespace n on n.oid = c.relnamespace
-    where n.nspname = $1 and c.relkind in ('v', 'm', 'r')
-  `, [SCRATCH]);
-  const views = rows.filter((row) => cellText(row.kind) === "v" || cellText(row.kind) === "m");
-  for (let pass = 0;pass < Math.max(views.length, 1); pass += 1) {
-    for (const row of views) {
-      const kind = cellText(row.kind) === "m" ? "materialized view" : "view";
-      try {
-        await runner.query(`drop ${kind} if exists ${quoteIdent(SCRATCH)}.${quoteIdent(cellText(row.name))}`);
-      } catch {}
-    }
-  }
-  for (const row of rows) {
-    if (cellText(row.kind) !== "r")
-      continue;
-    await runner.query(`drop table if exists ${quoteIdent(SCRATCH)}.${quoteIdent(cellText(row.name))}`);
-  }
-  await runner.query(`drop schema if exists ${quoteIdent(SCRATCH)} cascade`);
-}
-
-// src/tooling/migrate/drift.ts
-async function assertAuthorDrift2(url, author, roles) {
-  const sql = postgres(url, {
-    max: 1,
-    connect_timeout: 5,
-    idle_timeout: 1,
-    onnotice: () => {}
-  });
-  try {
-    const present = await sql`
-      select to_regclass('public.okm_meta')::text as reg
-    `;
-    if (present[0]?.reg == null)
-      return;
-    const runner = catalogQuery2(sql);
-    const authorOnServer = await sealViews(runner, author);
-    const live = await introspectSchema(runner, "public", "public", managedRoleOptions2(roles));
-    const plan = planMigration({ before: live, after: authorOnServer, name: "check" });
-    if (plan.steps.length === 0)
-      return;
-    throw new OkmError2("OKM1520", `The database differs from the schema.
-${plan.steps.map((step) => step.sql).join(`
-`)}`, {
-      fix: {
-        summary: "Change the schema or the database so okm check reports no difference."
-      }
-    });
-  } finally {
-    await sql.end({ timeout: 5 });
-  }
-}
-function catalogQuery2(sql) {
-  return {
-    async query(text, params) {
-      const rows = await sql.unsafe(text, params === undefined ? undefined : [...params]);
-      return rows.map((row) => {
-        const copy = {};
-        for (const [key, value] of Object.entries(row))
-          copy[key] = value;
-        return copy;
-      });
-    }
-  };
-}
-function managedRoleOptions2(roles) {
-  const names = managedRoleNames(roles);
-  return names === undefined ? undefined : { managedRoles: names };
-}
-function managedRoleNames(roles) {
-  if (roles === undefined)
-    return;
-  const names = new Set([roles.migration, roles.app]);
-  for (const role of roles.managed ?? [])
-    names.add(role.name);
-  return [...names];
-}
-
-export { introspectSchema, sealViews, assertAuthorDrift2, catalogQuery2, managedRoleOptions2 };
+export { cellText, VIEW_DEPENDENCIES, viewDependencyEdges, PUBLIC, introspectSchema, FUNCTION_ARG_TYPES };