okmodel 0.8.0 → 0.9.0

package/dist/shared/{mkrn359n.js → 90sg0w5a.js}

@@ -3,6 +3,10 @@ import {
   viewObject,
   materializedViewObject
 } from "./12z7aznj.js";
+import {
+  quoteIdent2,
+  createObjectSql2
+} from "./fk9vef30.js";
 import {
   cellText,
   VIEW_DEPENDENCIES,
@@ -10,18 +14,14 @@ import {
   PUBLIC,
   introspectSchema,
   atomicBody
-} from "./p3xbdcvt.js";
+} from "./myk8fswx.js";
 import {
   planMigration,
   sessionFailure,
   finishQuiet,
   assertDirectConnection,
   assertStableBackend
-} from "./dpc2r7rb.js";
-import {
-  quoteIdent,
-  createObjectSql
-} from "./sjk86yrx.js";
+} from "./6nae0spm.js";
 import {
   catalog
 } from "./ywspezzx.js";
@@ -54,7 +54,7 @@ async function sealViews(runner, source) {
   if (views.length === 0 && !hasAtomic)
     return source;
   await dropScratch(runner);
-  await runner.query(`create schema ${quoteIdent(SCRATCH)}`);
+  await runner.query(`create schema ${quoteIdent2(SCRATCH)}`);
   const previous = await runner.query(`select current_setting('search_path') as path`);
   const saved = cellText(previous[0]?.path);
   const path = await scratchSearchPath(runner, source);
@@ -141,44 +141,53 @@ async function scratchSearchPath(runner, source) {
     }
   }
   extra.sort();
-  return [SCRATCH, ...extra, "public"].map((name) => quoteIdent(name)).join(", ");
+  return [SCRATCH, ...extra, "public"].map((name) => quoteIdent2(name)).join(", ");
 }
 async function createObjects(runner, source, kind) {
   for (const object of source.objects) {
     if (object.kind !== kind)
       continue;
-    const statement = createObjectSql(object, SCRATCH);
+    const statement = createObjectSql2(object, SCRATCH);
     if (statement !== undefined)
       await runner.query(statement);
   }
 }
 var FUNCTION_DEFS = `
-  select pg_get_functiondef(p.oid) as definition
+  select p.proname as name,
+    pg_get_function_identity_arguments(p.oid) as args,
+    pg_get_functiondef(p.oid) as definition
   from pg_proc p
   join pg_namespace n on n.oid = p.pronamespace
   where n.nspname = $1 and p.prokind = 'f'
-  order by p.oid
 `;
 async function reprintAtomicBodies(runner, source) {
   const created = source.objects.filter((object) => object.kind === "function");
   if (!created.some((object) => object.definition.atomic === true))
     return source;
   const rows = await runner.query(FUNCTION_DEFS, [SCRATCH]);
-  if (rows.length !== created.length) {
-    throw new OkmError2("OKM1020", `Expected ${String(created.length)} functions in the scratch schema and found ${String(rows.length)}.`, { fix: { summary: "The function body has to run against the tables in this schema." } });
-  }
-  const bodies = new Map;
-  for (let index = 0;index < created.length; index += 1) {
-    const object = created[index];
-    if (object === undefined || object.definition.atomic !== true)
-      continue;
-    bodies.set(object, atomicBody(cellText(rows[index]?.definition)));
+  const printed = rows.map((row) => ({
+    name: cellText(row.name),
+    args: splitIdentityArguments(cellText(row.args)),
+    body: atomicBody(cellText(row.definition))
+  }));
+  const byName = new Map;
+  for (let index = 0;index < printed.length; index += 1) {
+    const name = printed[index]?.name ?? "";
+    const list = byName.get(name);
+    if (list === undefined)
+      byName.set(name, [index]);
+    else
+      list.push(index);
   }
+  const used = new Set;
   let changed = false;
   const objects = source.objects.map((object) => {
-    if (object.kind !== "function")
+    if (object.kind !== "function" || object.definition.atomic !== true)
       return object;
-    const body = bodies.get(object);
+    const named = byName.get(object.identity.name) ?? [];
+    const index = chooseReprint(object, printed, named, used);
+    used.add(index);
+    const body = printed[index]?.body;
     if (body === undefined || body === object.definition.body)
       return object;
     changed = true;
@@ -186,6 +195,111 @@ async function reprintAtomicBodies(runner, source) {
   });
   return changed ? catalog(objects) : source;
 }
+function chooseReprint(object, printed, named, used) {
+  const only = named[0];
+  if (named.length === 1 && only !== undefined && !used.has(only))
+    return only;
+  const matches = named.filter((index) => {
+    const row = printed[index];
+    return row !== undefined && !used.has(index) && identityMatches(object, row.args);
+  });
+  const index = matches[0];
+  if (named.length > 1 && matches.length === 1 && index !== undefined)
+    return index;
+  throw reprintMiss(object, named.map((index) => printed[index]).filter((row) => row !== undefined));
+}
+function reprintMiss(object, rows) {
+  const catalog = object.identity.argTypes.join(", ");
+  const scratch = rows.length === 0 ? "(none)" : rows.map((row) => row.args.length === 0 ? "(no arguments)" : row.args.join(", ")).join("; ");
+  return new OkmError2("OKM1020", `Function ${object.identity.name}(${catalog}) was not created in the scratch schema. Catalog arguments: ${catalog}. Scratch arguments: ${scratch}.`, { fix: { summary: "The function body has to run against the tables in this schema." } });
+}
+function identityMatches(object, args) {
+  if (args.length !== object.identity.argTypes.length)
+    return false;
+  return args.every((printed, index) => printedHasType(object.identity.argTypes[index] ?? "", printed));
+}
+function splitIdentityArguments(args) {
+  const trimmed = args.trim();
+  if (trimmed.length === 0)
+    return [];
+  const parts = [];
+  let current = "";
+  let depth = 0;
+  for (const char of trimmed) {
+    if (char === "(")
+      depth += 1;
+    else if (char === ")" && depth > 0)
+      depth -= 1;
+    if (char === "," && depth === 0) {
+      parts.push(current.trim());
+      current = "";
+      continue;
+    }
+    current += char;
+  }
+  parts.push(current.trim());
+  return parts;
+}
+var ARG_TYPE_ALIASES = {
+  int: "integer",
+  int2: "smallint",
+  int4: "integer",
+  int8: "bigint",
+  bool: "boolean",
+  decimal: "numeric",
+  char: "character",
+  float4: "real",
+  float8: "double precision",
+  varchar: "character varying",
+  time: "time without time zone",
+  timetz: "time with time zone",
+  timestamp: "timestamp without time zone",
+  timestamptz: "timestamp with time zone"
+};
+function printedHasType(author, printed) {
+  const want = canonicalArgType(author);
+  const got = printed.trim().replaceAll(/\s+/g, " ").toLowerCase();
+  if (canonicalArgType(got) === want)
+    return true;
+  const space = got.indexOf(" ");
+  if (space < 0)
+    return false;
+  const name = got.slice(0, space);
+  if (!/^[a-z_][a-z0-9_]*$/.test(name))
+    return false;
+  return canonicalArgType(got.slice(space + 1)) === want;
+}
+function canonicalArgType(type) {
+  let compact = type.trim().replaceAll(/\s+/g, " ").toLowerCase();
+  const dot = compact.lastIndexOf(".");
+  if (dot >= 0)
+    compact = compact.slice(dot + 1);
+  compact = stripTypmods(compact).replaceAll(/\s+/g, " ").trim();
+  let arrays = 0;
+  while (compact.endsWith("[]")) {
+    arrays += 1;
+    compact = compact.slice(0, -2).trim();
+  }
+  const aliased = ARG_TYPE_ALIASES[compact] ?? compact;
+  return arrays === 0 ? aliased : `${aliased}${"[]".repeat(arrays)}`;
+}
+function stripTypmods(type) {
+  let out = "";
+  let depth = 0;
+  for (const char of type) {
+    if (char === "(") {
+      depth += 1;
+      continue;
+    }
+    if (char === ")" && depth > 0) {
+      depth -= 1;
+      continue;
+    }
+    if (depth === 0)
+      out += char;
+  }
+  return out;
+}
 async function createViews(runner, views) {
   const pending = [...views];
   let last = "";
@@ -193,7 +307,7 @@ async function createViews(runner, views) {
     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}`;
+      const sql = object.kind === "materializedView" ? `create materialized view ${quoteIdent2(object.identity.name)} as ${object.definition.query} with no data` : `create view ${quoteIdent2(object.identity.name)} as ${object.definition.query}`;
       try {
         await runner.query(sql);
         created += 1;
@@ -213,8 +327,8 @@ async function createViews(runner, views) {
 }
 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(", ")})`;
+  const lines = columns.map((column) => `${quoteIdent2(column.identity.name)} ${column.definition.dataType}`);
+  return `create table ${quoteIdent2(object.identity.name)} (${lines.join(", ")})`;
 }
 function readColumns(object, printed) {
   const live = printed.length === 0 ? [] : printed.split(`
@@ -260,20 +374,20 @@ async function dropScratch(runner) {
     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))}`);
+        await runner.query(`drop ${kind} if exists ${quoteIdent2(SCRATCH)}.${quoteIdent2(cellText(row.name))}`);
       } catch {}
     }
   }
   for (const row of routines) {
     const args = cellText(row.args);
-    await runner.query(`drop function if exists ${quoteIdent(SCRATCH)}.${quoteIdent(cellText(row.name))}(${args})`);
+    await runner.query(`drop function if exists ${quoteIdent2(SCRATCH)}.${quoteIdent2(cellText(row.name))}(${args})`);
   }
   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 table if exists ${quoteIdent2(SCRATCH)}.${quoteIdent2(cellText(row.name))}`);
   }
-  await runner.query(`drop schema if exists ${quoteIdent(SCRATCH)} cascade`);
+  await runner.query(`drop schema if exists ${quoteIdent2(SCRATCH)} cascade`);
 }
 
 // src/tooling/migrate/drift.ts
@@ -290,14 +404,15 @@ async function assertAuthorDrift2(url, author, roles, allowPooler = false) {
       const rows = await sql`select pg_backend_pid()::text as pid`;
       return rows[0]?.pid ?? "";
     }, allowPooler);
+    const schema = authorSchema(author);
     const present = await sql`
-      select to_regclass('public.okm_meta')::text as reg
+      select to_regclass(${metaReg(schema)})::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 live = await introspectSchema(runner, schema, schema, managedRoleOptions2(roles));
     const plan = planMigration({ before: live, after: authorOnServer, name: "check" });
     if (plan.steps.length === 0)
       return;
@@ -334,6 +449,19 @@ function managedRoleOptions2(roles) {
     ...roles?.reporting !== undefined ? { reportingRole: roles.reporting } : {}
   };
 }
+function authorSchema(author) {
+  for (const object of author.objects) {
+    if (object.kind === "table" && object.owner !== "external" && object.identity.namespace.form === "static") {
+      return object.identity.namespace.name;
+    }
+  }
+  return "public";
+}
+function metaReg(schema) {
+  if (schema === "public")
+    return "public.okm_meta";
+  return `${quoteIdent2(schema)}.okm_meta`;
+}
 function managedRoleNames(roles) {
   if (roles === undefined)
     return;

package/dist/shared/{7ghwamrf.js → 99qp9vtg.js}

@@ -3,7 +3,7 @@ import {
 } from "./cnkky55j.js";
 import {
   rejectClosed
-} from "./ae4j5f42.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/reserved.ts
 var RESET_ALL = "RESET ALL";

package/dist/shared/{bxas03mq.js → 9dtgn1z2.js}

@@ -244,7 +244,7 @@ async function planInsert(table, input, options, mods, generators, scope, tenanc
       keyColumns: undefined
     };
   }
-  const conflictMod = options.onConflict === undefined || options.onConflict === "error" ? undefined : await import("./63f4ksbz.js");
+  const conflictMod = options.onConflict === undefined || options.onConflict === "error" ? undefined : await import("./xwhdcrm4.js");
   const conflict = conflictMod?.readConflict(table, options.onConflict, allow, tenantKeyList(tenancy));
   if (conflict?.kind === "update" && traitNamed(table, "versioned")) {
     fail2("OKM1120", `onConflict update on ${table.model.name} does not check the version you read.`, "Read the row and update. ignore and return do not change the existing row.");

package/dist/shared/{p5nh3r8q.js → aksb89mn.js}

@@ -1,13 +1,13 @@
 import {
   identityColumn2
-} from "./g5yc06ka.js";
+} from "./s7he5e5d.js";
 import {
   runWrite
 } from "./n4jqhpqz.js";
 import {
   queryHandle,
   settleCall
-} from "./bah9nbg3.js";
+} from "./npdftanb.js";
 import {
   withRowFilters,
   archiveRules,

package/dist/shared/{wcrheftc.js → bphrgwz9.js}

@@ -4,7 +4,7 @@ import {
 } from "./cm3w0ywp.js";
 import {
   PgSession
-} from "./35q0n9tz.js";
+} from "./dd5pmnky.js";
 import {
   isConnectionLost
 } from "./cnkky55j.js";
@@ -15,7 +15,7 @@ import {
   runCall,
   rowsFrom,
   resultFrom
-} from "./ae4j5f42.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/postgres-extra.ts
 var RESET_ALL = "RESET ALL";

package/dist/shared/{wz2a78mp.js → c3mvnq7a.js}

@@ -1,7 +1,7 @@
 import {
   build2,
   identityColumn2
-} from "./g5yc06ka.js";
+} from "./s7he5e5d.js";
 export {
   build2 as build,
   identityColumn2 as identityColumn

package/dist/shared/{pan0370z.js → ccsmhv9r.js}

@@ -1,9 +1,12 @@
 import {
   open2
-} from "./35q0n9tz.js";
+} from "./dd5pmnky.js";
 import {
   startupHash2
 } from "./12z7aznj.js";
+import {
+  quoteIdent2
+} from "./fk9vef30.js";
 import {
   runTarget,
   assumeRole,
@@ -14,12 +17,12 @@ import {
   provisionMark,
   expandProvisioned,
   installSnapshot
-} from "./mnvjvqyp.js";
+} from "./3456242y.js";
 import {
   assertCreateRole,
   currentUser,
   roleExists
-} from "./kj9d8maq.js";
+} from "./jpybhf98.js";
 import {
   projectPath,
   loadMigrations,
@@ -30,7 +33,7 @@ import {
   projectHead,
   loadBuiltSchema,
   loadConfig
-} from "./f4jy1j7x.js";
+} from "./2zdxkt7b.js";
 import {
   changesRole,
   batchSizeField,
@@ -41,7 +44,7 @@ import {
   assertDirectConnection,
   assertStableBackend,
   selectTarget
-} from "./dpc2r7rb.js";
+} from "./6nae0spm.js";
 import {
   UUIDV7_POSTGRES,
   uuidv7NeedsPostgres
@@ -198,6 +201,7 @@ async function applyTarget2(request) {
     await prepareMigrationRole(connection, request, session);
     await assertExtensionsAvailable(connection, request.migrations);
     await assertUuidV7Available(connection, request.migrations);
+    await enterCatalogSchema(connection, request.schema ?? "public");
     const state = request.snapshot === undefined ? undefined : await targetState(connection);
     if (request.snapshot !== undefined && state !== undefined) {
       if (state.kind === "empty") {
@@ -273,6 +277,7 @@ nothing to apply
       reference: built === undefined ? [] : readReference(built.tables, built.casing, head.catalog)
     },
     ...config.roles !== undefined ? { migrationRole: config.roles.migration, appRole: config.roles.app } : {},
+    ...catalogSchema(config.namespace),
     lintDirectory: directory,
     onProgress: (line) => {
       if (write !== undefined)
@@ -299,6 +304,7 @@ async function pushProject2(cwd, flags) {
     after: head.catalog,
     renames: head.renames,
     name: "push",
+    ...catalogSchema(config.namespace),
     ...batchSizeField(config.backfill?.batchSize)
   });
   if (plan.steps.length === 0)
@@ -319,7 +325,8 @@ no changes
         steps: plan.steps
       }
     ],
-    ...config.roles !== undefined ? { migrationRole: config.roles.migration, appRole: config.roles.app } : {}
+    ...config.roles !== undefined ? { migrationRole: config.roles.migration, appRole: config.roles.app } : {},
+    ...catalogSchema(config.namespace)
   });
   return formatReport(report);
 }
@@ -514,6 +521,17 @@ async function insertReference(connection, request) {
 function concreteSchema(request) {
   return request.searchPath ?? request.schema ?? "public";
 }
+function catalogSchema(namespace) {
+  if (namespace === undefined || namespace === "public")
+    return;
+  return { schema: namespace };
+}
+async function enterCatalogSchema(connection, schema) {
+  if (schema === "public")
+    return;
+  await connection.execute(`create schema if not exists ${quoteIdent2(schema)}`);
+  await connection.execute(`set search_path to ${quoteIdent2(schema)}`);
+}
 async function targetState(connection) {
   const meta = await connection.execute(`select to_regclass('okm_meta') is not null
          or to_regclass('okm_history') is not null

package/dist/shared/{n0jmpgj1.js → cexb7z6b.js}

@@ -3,7 +3,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./bah9nbg3.js";
+} from "./npdftanb.js";
 import {
   selectedColumns,
   parseOrder,

package/dist/shared/{wvdjznah.js → cf8zdz5p.js}

@@ -5,11 +5,11 @@ import {
   send2,
   reserve,
   park
-} from "./zbqbmmrp.js";
+} from "./62b603gr.js";
 import {
   resetSession2,
   refuseWhenLost2
-} from "./7ghwamrf.js";
+} from "./99qp9vtg.js";
 import {
   cursorStream
 } from "./7kms6fvj.js";
@@ -18,14 +18,14 @@ import {
 } from "./cnkky55j.js";
 import {
   noTimeout
-} from "./q0cqt2sp.js";
+} from "./tr64w5p0.js";
 import {
   WireSession
-} from "./mtw6jz76.js";
+} from "./e275q7sd.js";
 import {
   rejectClosed,
   runCall
-} from "./ae4j5f42.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/bunsql-extra.ts
 async function recover(sql, error, text, depth, clientRead, closedDuring, again) {

package/dist/shared/{3449rcae.js → ckz05z15.js}

@@ -2,10 +2,10 @@ import {
   assertAuthorDrift2,
   catalogQuery2,
   managedRoleOptions2
-} from "./mkrn359n.js";
-import"./p3xbdcvt.js";
-import"./dpc2r7rb.js";
-import"./sjk86yrx.js";
+} from "./90sg0w5a.js";
+import"./myk8fswx.js";
+import"./6nae0spm.js";
+import"./fk9vef30.js";
 import"./12z7aznj.js";
 export {
   assertAuthorDrift2 as assertAuthorDrift,

package/dist/shared/{35q0n9tz.js → dd5pmnky.js}

@@ -6,7 +6,7 @@ import {
   runCall,
   EMPTY_NOTICES,
   resultFrom
-} from "./ae4j5f42.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/postgresjs.ts
 import net from "node:net";
@@ -118,17 +118,17 @@ function open2(config) {
       return sockets.occupy(() => runCall(closed, options, (watch) => root.query(text, params, watch)));
     },
     batch(statements, options) {
-      return sockets.occupy(() => import("./z581d7ny.js").then((mod) => mod.runBatch(held, statements, options)));
+      return sockets.occupy(() => import("./fdsz3w80.js").then((mod) => mod.runBatch(held, statements, options)));
     },
     reserve() {
       const gate = sockets.busyGate();
       gate.enter();
-      return import("./z581d7ny.js").then((mod) => mod.holdCheckout(gate, () => mod.checkout(held)), (error) => {
+      return import("./fdsz3w80.js").then((mod) => mod.holdCheckout(gate, () => mod.checkout(held)), (error) => {
         gate.leave();
         throw error;
       });
     },
-    describe: (text, params) => sockets.occupy(() => import("./z581d7ny.js").then((mod) => mod.describe(sql, text, params))),
+    describe: (text, params) => sockets.occupy(() => import("./fdsz3w80.js").then((mod) => mod.describe(sql, text, params))),
     stream(text, params) {
       const gate = sockets.busyGate();
       return async function* () {
@@ -143,7 +143,7 @@ function open2(config) {
     listen(channel, onNotify) {
       const gate = sockets.listenerGate();
       gate.enter();
-      return import("./z581d7ny.js").then((mod) => mod.holdListener(gate, async () => {
+      return import("./fdsz3w80.js").then((mod) => mod.holdListener(gate, async () => {
         const listening = await sql.listen(channel, onNotify);
         return async () => {
           await listening.unlisten();
@@ -213,7 +213,7 @@ class PgSession {
       onAbort();
     else
       watch.signal.addEventListener("abort", onAbort, { once: true });
-    return import("./z581d7ny.js").then((mod) => mod.watchQuery(pending, watch, onAbort, {
+    return import("./fdsz3w80.js").then((mod) => mod.watchQuery(pending, watch, onAbort, {
       start,
       text,
       notices: this.notices,
@@ -265,7 +265,7 @@ class PgSession {
   }
 }
 async function* loadStream(sql, text, params) {
-  const { stream } = await import("./z581d7ny.js");
+  const { stream } = await import("./fdsz3w80.js");
   yield* stream(sql, text, params);
 }
 function send(sql, text, params, named) {

package/dist/shared/{e8zyaqvj.js → ds229x4r.js}

@@ -7,7 +7,7 @@ import {
 import {
   withHttp,
   settleCall
-} from "./bah9nbg3.js";
+} from "./npdftanb.js";
 import {
   rejectKeys,
   isRecord,

package/dist/{tooling/shared/yw30vnq2.js → shared/e275q7sd.js}

@@ -4,7 +4,7 @@ import {
   nextTransactionDepth,
   EMPTY_NOTICES,
   resultFrom
-} from "./xhrnjch9.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/session.ts
 function noticeBuffer() {

package/dist/shared/{mfedzr74.js → ebhz8vh6.js}

@@ -5,10 +5,10 @@ import {
   armDriverError,
   send,
   connectClient
-} from "./14x60fbf.js";
+} from "./1mxm04fy.js";
 import {
   resetSession2
-} from "./7ghwamrf.js";
+} from "./99qp9vtg.js";
 import {
   cursorStream
 } from "./7kms6fvj.js";
@@ -17,11 +17,11 @@ import {
 } from "./cnkky55j.js";
 import {
   WireSession
-} from "./mtw6jz76.js";
+} from "./e275q7sd.js";
 import {
   rejectClosed,
   runCall
-} from "./ae4j5f42.js";
+} from "./mfvx6kjx.js";
 
 // src/adapters/pg/nodepostgres-extra.ts
 async function checkout(held) {

package/dist/shared/{z581d7ny.js → fdsz3w80.js}

@@ -7,8 +7,8 @@ import {
   holdCheckout2,
   holdListener2,
   watchQuery2
-} from "./wcrheftc.js";
-import"./35q0n9tz.js";
+} from "./bphrgwz9.js";
+import"./dd5pmnky.js";
 import"./cm3w0ywp.js";
 export {
   checkout2 as checkout,