okmodel 0.4.0 → 0.5.0

package/dist/shared/{c5g81ngb.js → bzsjtd7c.js}

@@ -1,7 +1,7 @@
 import {
   open2
 } from "./wqem4jed.js";
-import"./8jb4ymh2.js";
+import"./8bwbwy8h.js";
 import"./n442h54c.js";
 import {
   CURRENT,
@@ -15,14 +15,16 @@ import {
   loadMigrations,
   expandProvisioned,
   provisionHistoryIsKnown
-} from "./7nk68fj8.js";
+} from "./kdkxh3kb.js";
+import"./szm0cksa.js";
+import"./fancm5pt.js";
 import {
   assertTargetPolicy,
   listTargets,
   loadConfig
-} from "./q6zsyh31.js";
-import"./n5y9zyj1.js";
-import"./41kv2xdm.js";
+} from "./xdpj5kkm.js";
+import"./ayz64vzj.js";
+import"./8xsbagad.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{radd3z4g.js → ckjbyrt9.js}

@@ -14,7 +14,7 @@ import {
   isRecord,
   registerFailFix,
   fail
-} from "./xrfnq5k8.js";
+} from "./qgvt8nx1.js";
 import {
   safetyInstalled,
   runSafety

package/dist/shared/{zg24x0hm.js → dxjp14rk.js}

@@ -3,10 +3,10 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./kkzwp3d2.js";
+} from "./bt9sfq0z.js";
 import {
   fail
-} from "./xrfnq5k8.js";
+} from "./qgvt8nx1.js";
 import {
   OkmError2,
   throwNamed2
@@ -27,6 +27,14 @@ function build(session, table, options, mods, view) {
 }
 function plan(session, table, options, mods, view) {
   const { lock, wait, ...rest } = options;
+  const forced = session.pool.forcedRoute;
+  if (rest.route === "replica" || forced === "replica") {
+    throw new OkmError2("OKM1840", "A locking read needs the primary.", {
+      fix: {
+        summary: "Run the operation on the primary. Writes, batch, locks, and tx() never go to a replica."
+      }
+    });
+  }
   if (session.tx === undefined) {
     throw new OkmError2("OKM1830", "A row lock needs a transaction. find was called outside tx().", {
       fix: { summary: "Move the find into tx(): the lock lasts until the transaction ends." }

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

package/dist/shared/{yjw02enp.js → fyqkk1m0.js}

@@ -1,12 +1,12 @@
-import"./8jb4ymh2.js";
+import"./8bwbwy8h.js";
 import"./n442h54c.js";
 import"./wqem4jed.js";
 import {
   listTargets,
   loadConfig
-} from "./q6zsyh31.js";
-import"./n5y9zyj1.js";
-import"./41kv2xdm.js";
+} from "./xdpj5kkm.js";
+import"./ayz64vzj.js";
+import"./8xsbagad.js";
 
 // src/tooling/migrate/dev.ts
 import { mkdirSync } from "node:fs";

package/dist/shared/{ygem90rn.js → g516zdsb.js}

@@ -1,9 +1,9 @@
 import {
   renderCatalog
-} from "./41kv2xdm.js";
+} from "./8xsbagad.js";
 import {
   createClient
-} from "./kkzwp3d2.js";
+} from "./bt9sfq0z.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -12,10 +12,15 @@ import {
 var tenantProbe = "00000000-0000-4000-8000-000000000001";
 function readFacts(schema) {
   const foreign = foreignKeys(schema.catalog);
+  const tables = new Set;
+  for (const object of schema.catalog.objects) {
+    if (object.kind === "table")
+      tables.add(object.identity.name);
+  }
   const facts = [];
   for (const name of Object.keys(schema.model)) {
     const model = schema.model[name];
-    if (model === undefined)
+    if (model === undefined || !tables.has(model.sql))
       continue;
     const keys = foreign.get(model.sql) ?? [];
     facts.push({

package/dist/shared/{v7tpnhnz.js → h4nqvjkp.js}

@@ -3,7 +3,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./kkzwp3d2.js";
+} from "./bt9sfq0z.js";
 import {
   selectedColumns,
   parseOrder,
@@ -15,7 +15,7 @@ import {
   isRecord,
   registerFailFix,
   fail
-} from "./xrfnq5k8.js";
+} from "./qgvt8nx1.js";
 import {
   OkmError2,
   throwNamed2
@@ -30,6 +30,7 @@ var OPTIONS = [
   "limit",
   "include",
   "after",
+  "route",
   "signal",
   "timeout"
 ];
@@ -69,7 +70,8 @@ function plan(session, table, options, mods, view) {
       limit: size + 1,
       include: record.include,
       signal: record.signal,
-      timeout: record.timeout
+      timeout: record.timeout,
+      route: record.route
     }, undefined, session.scope, session.schema.model[table], session.schema, view),
     ...after !== undefined ? { after } : {}
   };

package/dist/shared/{edwqqryd.js → h8ne16fq.js}

@@ -17,7 +17,7 @@ import {
   isRecord,
   registerFailFix,
   fail
-} from "./xrfnq5k8.js";
+} from "./qgvt8nx1.js";
 import {
   throwNamed2
 } from "./52szzakm.js";

package/dist/shared/{ady1ms74.js → jdgqqx31.js}

@@ -1,11 +1,11 @@
 import {
   open2
 } from "./wqem4jed.js";
-import"./8jb4ymh2.js";
+import"./8bwbwy8h.js";
 import {
   createdOf,
   testing2
-} from "./ygem90rn.js";
+} from "./g516zdsb.js";
 import"./n442h54c.js";
 import {
   assertTargetPolicy,
@@ -13,9 +13,9 @@ import {
   selectTarget,
   loadConfig,
   loadSchema
-} from "./q6zsyh31.js";
-import"./n5y9zyj1.js";
-import"./41kv2xdm.js";
+} from "./xdpj5kkm.js";
+import"./ayz64vzj.js";
+import"./8xsbagad.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{kafaa5zv.js → k7cc9nzk.js}

@@ -5,12 +5,12 @@ import {
   openClient,
   withHttp,
   settleCall
-} from "./kkzwp3d2.js";
+} from "./bt9sfq0z.js";
 import {
   rejectKeys,
   isRecord,
   fail
-} from "./xrfnq5k8.js";
+} from "./qgvt8nx1.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -312,8 +312,16 @@ function held(session, frame, after, depth) {
   };
   const pool = depth === 0 ? {
     capabilities: base.capabilities,
-    execute: (text, params, options) => guarded(() => frame.conn.execute(text, params, stoppable(frame, options)), false),
-    batch: (statements, options) => guarded(() => frame.conn.batch(statements, stoppable(frame, options)), true),
+    execute: (text, params, options) => {
+      if (options?.route === "replica")
+        replicaInside();
+      return guarded(() => frame.conn.execute(text, params, stoppable(frame, options)), false);
+    },
+    batch: (statements, options) => {
+      if (options?.route === "replica")
+        replicaInside();
+      return guarded(() => frame.conn.batch(statements, stoppable(frame, options)), true);
+    },
     stats: () => base.stats(),
     close: () => Promise.resolve()
   } : base;
@@ -364,13 +372,22 @@ function lockKey(key) {
   return ["select pg_advisory_xact_lock($1::bigint)", String(key)];
 }
 function callOf(options) {
-  if (options?.signal === undefined && options?.timeout === undefined)
+  if (options?.signal === undefined && options?.timeout === undefined && options?.route === undefined) {
     return;
+  }
   return {
-    ...options.signal !== undefined ? { signal: options.signal } : {},
-    ...options.timeout !== undefined ? { timeout: options.timeout } : {}
+    ...options?.signal !== undefined ? { signal: options.signal } : {},
+    ...options?.timeout !== undefined ? { timeout: options.timeout } : {},
+    ...options?.route !== undefined ? { route: options.route } : {}
   };
 }
+function replicaInside() {
+  throw new OkmError2("OKM1840", "This operation needs the primary.", {
+    fix: {
+      summary: "Run the operation on the primary. Writes, batch, locks, and tx() never go to a replica."
+    }
+  });
+}
 export {
   tx
 };

package/dist/shared/{7nk68fj8.js → kdkxh3kb.js}

@@ -1,17 +1,19 @@
 import {
   serializeCatalog2,
   catalogHash2,
+  startupCatalog2,
   parseCatalog2
-} from "./8jb4ymh2.js";
+} from "./8bwbwy8h.js";
 import {
   roleExists
-} from "./hcmdtwgh.js";
+} from "./szm0cksa.js";
 import {
   assertTargetPolicy
-} from "./q6zsyh31.js";
+} from "./xdpj5kkm.js";
 import {
   canonicalTypeName,
   createdRoleName,
+  createRoleOnce,
   DEFAULT_BACKFILL_PAUSE_MS,
   DEFAULT_BACKFILL_STATEMENT_TIMEOUT_MS,
   boundaryQuery,
@@ -19,11 +21,11 @@ import {
   omitManagedObjects,
   planMigration,
   parsePlan
-} from "./n5y9zyj1.js";
+} from "./ayz64vzj.js";
 import {
   quoteIdent,
   qualify
-} from "./41kv2xdm.js";
+} from "./8xsbagad.js";
 import {
   alignExtensionVersions
 } from "./8ktwd3rh.js";
@@ -98,8 +100,10 @@ async function runUnit(connection, unit, run, session) {
         await rebuildInvalidIndex(connection, item.step.sql);
         const created = createdRoleName(item.step.sql);
         const existed = created !== undefined && await roleExists(connection, created);
-        if (created === undefined || !existed)
+        if (created === undefined)
           await connection.execute(item.step.sql);
+        else if (!existed)
+          await connection.execute(createRoleOnce(item.step.sql));
         if (created !== undefined && created === run.migrationRole) {
           if (!existed) {
             await grantSchema(connection, run.schema ?? "public", created);
@@ -377,8 +381,10 @@ function loadMigrations(directory) {
       });
     }
     const plan = parsePlan(readFileSync(join(directory, file), "utf8"));
-    const hash = catalogHash2(parseCatalog2(readFileSync(catalogPath, "utf8")));
-    migrations.push({ id, catalogHash: hash, steps: plan.steps });
+    const stored = parseCatalog2(readFileSync(catalogPath, "utf8"));
+    const startup = startupCatalog2(stored);
+    const hash = catalogHash2(startup);
+    migrations.push(startup === stored ? { id, catalogHash: hash, steps: plan.steps } : { id, catalogHash: hash, legacyHash: catalogHash2(stored), steps: plan.steps });
   }
   return migrations;
 }
@@ -601,11 +607,12 @@ async function installSnapshot(connection, head, schema, reference, session, mig
           await assumeRole(connection, created, session);
         continue;
       }
+      const sql = created === undefined ? step.sql : createRoleOnce(step.sql);
       if (step.transactional && !statementOutsideTransaction(step.sql)) {
-        batch.push(step.sql);
+        batch.push(sql);
       } else {
         await flush();
-        await connection.execute(step.sql);
+        await connection.execute(sql);
       }
       if (created !== undefined && created === migrationRole) {
         await flush();