okmodel 0.5.0 → 0.5.1

package/dist/shared/{9tgmr1gh.js → 32zqc1dw.js}

@@ -9,7 +9,7 @@ import {
   isRecord,
   registerFailFix,
   fail
-} from "./qgvt8nx1.js";
+} from "./gbtcc2d7.js";
 import {
   throwNamed2
 } from "./52szzakm.js";
@@ -18,7 +18,7 @@ import {
 registerFailFix("OKM1104", "Set on to the columns of a unique constraint or the primary key.");
 registerFailFix("OKM1190", "Remove the guarded field. Input cannot set it.");
 var NO_ALLOW = new Set;
-function readConflict(table, value, allow = NO_ALLOW) {
+function readConflict(table, value, allow = NO_ALLOW, tenantKey) {
   if (value === undefined || value === "error")
     return;
   if (value === "ignore")
@@ -34,13 +34,13 @@ function readConflict(table, value, allow = NO_ALLOW) {
   }
   if (ret === true) {
     rejectConflictKeys(keys, ["on", "return"]);
-    return { kind: "return", columns: uniqueColumns(table, value.on), update: [] };
+    return { kind: "return", columns: uniqueColumns(table, value.on, tenantKey), update: [] };
   }
   if (update !== undefined) {
     rejectConflictKeys(keys, ["on", "update"]);
     return {
       kind: "update",
-      columns: uniqueColumns(table, value.on),
+      columns: uniqueColumns(table, value.on, tenantKey),
       update: updateColumns(table, update, allow)
     };
   }
@@ -110,7 +110,7 @@ function samePrimary(table, columns) {
   }
   return true;
 }
-function uniqueColumns(table, on) {
+function uniqueColumns(table, on, tenantKey) {
   const names = conflictNames(on);
   for (const unique of table.model.uniques) {
     if (!same(unique, names))
@@ -125,8 +125,19 @@ function uniqueColumns(table, on) {
     }
     return columns;
   }
-  const accepted = table.model.uniques.map((fields) => fields.join(", "));
-  throwNamed2("OKM1104", names.join(", "), accepted, `onConflict on ${table.model.name} names ${names.join(", ")}, which is not a unique constraint. Accepted: ${list(accepted)}.`);
+  const accepted = acceptedConstraints(table.model, tenantKey);
+  const implicit = tenantKey === undefined ? "" : ` The tenant key ${tenantKey} is part of each one and is not named here.`;
+  throwNamed2("OKM1104", names.join(", "), accepted, `onConflict on ${table.model.name} names ${names.join(", ")}, which is not a unique constraint. Accepted: ${list(accepted)}.${implicit}`);
+}
+function acceptedConstraints(model, key) {
+  const shown = new Set;
+  for (const fields of model.uniques) {
+    const named = key === undefined ? fields : fields.filter((field) => field !== key);
+    if (named.length === 0)
+      continue;
+    shown.add(named.length > 1 ? `(${named.join(", ")})` : named.join(""));
+  }
+  return [...shown];
 }
 function updateColumns(table, value, allow) {
   if (!Array.isArray(value) || value.length === 0) {

package/dist/shared/{47xzb9fc.js → 47x8x9ze.js}

@@ -1,7 +1,7 @@
 import {
   withHttp,
   attachHttp
-} from "./bt9sfq0z.js";
+} from "./hf22e0wt.js";
 import {
   OkmError2
 } from "./52szzakm.js";

package/dist/shared/{zvbjc949.js → 4az561fn.js}

@@ -4,7 +4,7 @@ import {
   nextTransactionDepth,
   EMPTY_NOTICES,
   resultFrom
-} from "./rrstp3kb.js";
+} from "./cgbamx3e.js";
 
 // src/adapters/pg/session.ts
 function quoteIdent2(name) {

package/dist/shared/{s6gqfn5j.js → 51mvgj8w.js}

@@ -1,7 +1,7 @@
 import {
   isConnectionSqlstate,
   isConnectionFailure
-} from "./tbszx8mz.js";
+} from "./pf0d8f77.js";
 import {
   OkmError2,
   stripRowValues,
@@ -16,12 +16,14 @@ function mapPostgresError(error, options) {
     return OkmError2.from(error);
   const kind = kindOf(error);
   const columns = columnsOf(error);
-  const fieldReason = kind === "not_null" ? "not_null" : reasonOf(kind, error.table, error.constraint);
+  const hint = hintOf(error, kind);
+  const fieldReason = hint?.reason ?? (kind === "not_null" ? "not_null" : reasonOf(kind, error.table, error.constraint));
   const values = options?.includeValues === true ? valuesOf(error.detail, columns) : undefined;
   const code = kind === "outcome_unknown" ? "OKM1401" : kind;
   return new OkmError2(code, summaryOf(kind, error, columns, fieldReason), {
     kind,
     fieldReason,
+    ...hint !== undefined ? { fix: hint.fix } : {},
     ...error.table !== undefined ? { table: error.table } : {},
     ...columns.length > 0 ? { columns } : {},
     ...error.constraint !== undefined ? { constraint: error.constraint } : {},
@@ -32,6 +34,12 @@ function mapPostgresError(error, options) {
     ...options?.http !== undefined ? { http: options.http } : {}
   });
 }
+var TLS_CODE = /^(ERR_TLS_|ERR_POSTGRES_TLS_|SELF_SIGNED_CERT_|DEPTH_ZERO_SELF_SIGNED_CERT$|UNABLE_TO_VERIFY_LEAF_SIGNATURE$)/;
+function isTlsFailure(error) {
+  const cause = error.cause;
+  const code = typeof cause === "object" && cause !== null ? Reflect.get(cause, "code") : undefined;
+  return typeof code === "string" && TLS_CODE.test(code);
+}
 function isDriverError(error) {
   if (!(error instanceof Error) || error.name !== "DriverError")
     return false;
@@ -47,10 +55,26 @@ function kindOf(error) {
     if (mapped !== undefined)
       return mapped;
   }
-  if (isConnectionFailure(error))
+  if (isTlsFailure(error) || isConnectionFailure(error))
     return "unavailable";
   return "driver";
 }
+var MIGRATE_FIX = {
+  summary: "Run okm migrate apply so the object exists, then check okm migrate status. The reason names the missing object."
+};
+var TLS_FIX = {
+  summary: "Check sslmode in the connection URL against the server certificate: use require, verify-ca, or verify-full with the CA the certificate chains to. For node-postgres, add uselibpqcompat=true so sslmode follows libpq."
+};
+function hintOf(error, kind) {
+  if (error.sqlstate === "42P01")
+    return { reason: "undefined_table", fix: MIGRATE_FIX };
+  if (error.sqlstate === "42703")
+    return { reason: "undefined_column", fix: MIGRATE_FIX };
+  if (kind === "unavailable" && error.sqlstate === undefined && isTlsFailure(error)) {
+    return { reason: "tls", fix: TLS_FIX };
+  }
+  return;
+}
 function kindFromSqlstate(sqlstate) {
   switch (sqlstate) {
     case "23505":

package/dist/shared/{k3ted12y.js → 54tqkxja.js}

@@ -1,4 +1,22 @@
 // src/adapters/pg/watch.ts
+var callers = new WeakMap;
+function listenOn(signal, onAbort) {
+  let set = callers.get(signal);
+  if (set === undefined) {
+    const created = new Set;
+    callers.set(signal, created);
+    signal.addEventListener("abort", () => {
+      for (const each of created)
+        each();
+    }, { once: true });
+    set = created;
+  }
+  const registered = set;
+  registered.add(onAbort);
+  return () => {
+    registered.delete(onAbort);
+  };
+}
 function openWatch(options) {
   let kind;
   const controller = new AbortController;
@@ -7,7 +25,7 @@ function openWatch(options) {
       kind = "cancelled";
     controller.abort();
   };
-  options.signal?.addEventListener("abort", onAbort, { once: true });
+  const release = options.signal === undefined ? undefined : listenOn(options.signal, onAbort);
   let timer;
   if (options.timeout !== undefined) {
     timer = setTimeout(() => {
@@ -21,7 +39,7 @@ function openWatch(options) {
     finish() {
       if (timer !== undefined)
         clearTimeout(timer);
-      options.signal?.removeEventListener("abort", onAbort);
+      release?.();
     },
     reason() {
       return kind;

package/dist/shared/{3p4b1fg0.js → 5enne4ma.js}

@@ -7,7 +7,7 @@ import {
   snakeCase,
   emittedTypeName,
   rejectLater
-} from "./jsd07prz.js";
+} from "./ntneex2a.js";
 import {
   withLocation
 } from "./k7dwkhvq.js";

package/dist/shared/{bzsjtd7c.js → 6mnp99hx.js}

@@ -1,6 +1,6 @@
 import {
   open2
-} from "./wqem4jed.js";
+} from "./krxx77g0.js";
 import"./8bwbwy8h.js";
 import"./n442h54c.js";
 import {
@@ -15,15 +15,16 @@ import {
   loadMigrations,
   expandProvisioned,
   provisionHistoryIsKnown
-} from "./kdkxh3kb.js";
+} from "./gde73es6.js";
 import"./szm0cksa.js";
 import"./fancm5pt.js";
 import {
-  assertTargetPolicy,
-  listTargets,
   loadConfig
-} from "./xdpj5kkm.js";
-import"./ayz64vzj.js";
+} from "./qv2ydck9.js";
+import {
+  assertTargetPolicy,
+  listTargets
+} from "./ga3sfy93.js";
 import"./8xsbagad.js";
 import {
   OkmError2

package/dist/shared/{ykv7wh5b.js → 6qd27mx0.js}

@@ -2,9 +2,9 @@ import {
   assertAuthorDrift2,
   catalogQuery2,
   managedRoleOptions2
-} from "./wxn4b7pp.js";
+} from "./sycnx8gt.js";
 import"./fancm5pt.js";
-import"./ayz64vzj.js";
+import"./ga3sfy93.js";
 import"./8xsbagad.js";
 import"./8bwbwy8h.js";
 export {

package/dist/shared/{h4nqvjkp.js → 6rk2gen5.js}

@@ -3,7 +3,7 @@ import {
   readHandle,
   readCall,
   attachHttp
-} from "./bt9sfq0z.js";
+} from "./hf22e0wt.js";
 import {
   selectedColumns,
   parseOrder,
@@ -15,7 +15,7 @@ import {
   isRecord,
   registerFailFix,
   fail
-} from "./qgvt8nx1.js";
+} from "./gbtcc2d7.js";
 import {
   OkmError2,
   throwNamed2

package/dist/shared/{r73pt594.js → 7zwwyh0v.js}

@@ -1,22 +1,22 @@
 import {
   parseCatalog2
 } from "./8bwbwy8h.js";
-import"./wqem4jed.js";
+import"./krxx77g0.js";
 import"./n442h54c.js";
 import {
   applyTarget2,
   backfillTiming2
-} from "./xhh1srw3.js";
+} from "./cctw17hj.js";
 import {
   sealViews,
   catalogQuery2,
   managedRoleOptions2
-} from "./wxn4b7pp.js";
+} from "./sycnx8gt.js";
 import {
   loadMigrations,
   catalogsEqual,
   snapshotDifference
-} from "./kdkxh3kb.js";
+} from "./gde73es6.js";
 import"./szm0cksa.js";
 import {
   introspectSchema
@@ -25,16 +25,18 @@ import {
   lintMigrationDirectory,
   hasError,
   lintRefusal,
-  selectTarget,
   openProject
-} from "./xdpj5kkm.js";
+} from "./qv2ydck9.js";
 import {
   canonicalTypeName,
   classOf,
   strictestClass,
   planMigration,
-  parsePlan
-} from "./ayz64vzj.js";
+  parsePlan,
+  assertDirectConnection,
+  assertStableBackend,
+  selectTarget
+} from "./ga3sfy93.js";
 import {
   quoteIdent
 } from "./8xsbagad.js";
@@ -64,6 +66,8 @@ var STALE_FIX = "Run okm generate.";
 async function checkMigrations(cwd, flags, options) {
   const opened = await openProject(cwd);
   const target = selectTarget(opened.config, flags.target);
+  const allowPooler = flags.allowPooler || opened.config.allowPooler === true;
+  assertDirectConnection(target.url, allowPooler);
   if (target.protected) {
     throw new OkmError2("OKM1850", `okm migrate check writes a scratch schema and refuses protected target ${target.name}. Point it at a throwaway Postgres.`, {
       kind: "forbidden",
@@ -180,6 +184,7 @@ async function proveSnapshot(config, url, target, flags, history) {
     idle_timeout: 1,
     onnotice: () => {}
   });
+  const allowPooler = flags.allowPooler || config.allowPooler === true;
   const provided = `${CHECK_SCHEMA_PREFIX}p${crypto.randomUUID().replaceAll("-", "")}`;
   const replayed = `${CHECK_SCHEMA_PREFIX}r${crypto.randomUUID().replaceAll("-", "")}`;
   const timing = {
@@ -188,6 +193,10 @@ async function proveSnapshot(config, url, target, flags, history) {
     ...backfillTiming2(config.backfill)
   };
   try {
+    await assertStableBackend(async () => {
+      const rows = await sql`select pg_backend_pid()::text as pid`;
+      return rows[0]?.pid ?? "";
+    }, allowPooler);
     await sql.unsafe(`create schema ${quoteIdent(provided)}`);
     await sql.unsafe(`create schema ${quoteIdent(replayed)}`);
     const role = config.roles === undefined ? {} : { migrationRole: config.roles.migration, schema: provided };
@@ -258,9 +267,14 @@ async function replayHistory(config, url, target, flags, history) {
     idle_timeout: 1,
     onnotice: () => {}
   });
+  const allowPooler = flags.allowPooler || config.allowPooler === true;
   const scratch = `${CHECK_SCHEMA_PREFIX}${crypto.randomUUID().replaceAll("-", "")}`;
   const failures = [];
   try {
+    await assertStableBackend(async () => {
+      const rows = await sql`select pg_backend_pid()::text as pid`;
+      return rows[0]?.pid ?? "";
+    }, allowPooler);
     await sql.unsafe(`create schema ${quoteIdent(scratch)}`);
     const runner = catalogQuery2(sql);
     for (let index = 0;index < history.length; index += 1) {
@@ -303,8 +317,16 @@ async function replayHistory(config, url, target, flags, history) {
   return failures;
 }
 async function introspectScratch(sql, schema, config) {
-  await sql.unsafe(`set search_path to ${quoteIdent(schema)}`);
-  return introspectSchema(catalogQuery2(sql), schema, "public", managedRoleOptions2(config.roles));
+  const previous = await sql`select current_setting('search_path') as path`;
+  const saved = previous[0]?.path ?? "public";
+  try {
+    await sql.unsafe(`set search_path to ${quoteIdent(schema)}`);
+    return await introspectSchema(catalogQuery2(sql), schema, "public", managedRoleOptions2(config.roles));
+  } finally {
+    await sql`select set_config('search_path', ${saved}, false)`.catch(() => {
+      return;
+    });
+  }
 }
 function historyFailure(history, index, back) {
   const migration = history[index];

package/dist/shared/{fa9vt245.js → 87jvvhnt.js}

@@ -9,7 +9,7 @@ import {
   runCall,
   EMPTY_NOTICES,
   resultFrom
-} from "./rrstp3kb.js";
+} from "./cgbamx3e.js";
 
 // src/adapters/pg/pglite.ts
 import { PGlite } from "@electric-sql/pglite";
@@ -48,7 +48,7 @@ async function open3(config = {}) {
     return {
       execute: (text, params, options) => runCall(closed, options, (watch) => session.query(text, params, watch)),
       batch: (statements, options) => runCall(closed, options, async (watch) => {
-        const { runAtomicBatch } = await import("./b066g80h.js");
+        const { runAtomicBatch } = await import("./efmy2gcg.js");
         return runAtomicBatch(session, statements, watch);
       }),
       async release() {

package/dist/shared/{c8aghh05.js → 8rsy3hxz.js}

@@ -422,6 +422,12 @@ function isRecord(value) {
 function failShape(message) {
   throw new OkmError2("OKM1121", message, { kind: "invalid" });
 }
+function failedMessage(first) {
+  if (first === undefined)
+    return "Validation failed.";
+  const field = first.path.length === 0 ? "$row" : first.path.join(".");
+  return `Validation failed: ${field} ${first.message}`;
+}
 function throwIssues(issues) {
   const columns = [];
   for (const issue of issues) {
@@ -429,7 +435,7 @@ function throwIssues(issues) {
     if (typeof field === "string" && !columns.includes(field))
       columns.push(field);
   }
-  throw new OkmError2("OKM1200", "Validation failed.", {
+  throw new OkmError2("OKM1200", failedMessage(issues[0]), {
     kind: "invalid",
     ...columns.length > 0 ? { columns } : {},
     issues,

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/{xsq7v6wp.js → aj2qxyhj.js}

@@ -4,12 +4,12 @@ import {
 import {
   withHttp,
   settleCall
-} from "./bt9sfq0z.js";
+} from "./hf22e0wt.js";
 import {
   rejectKeys,
   isRecord,
   fail
-} from "./qgvt8nx1.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/{xhh1srw3.js → cctw17hj.js}

@@ -1,6 +1,6 @@
 import {
   open2
-} from "./wqem4jed.js";
+} from "./krxx77g0.js";
 import {
   startupHash2
 } from "./8bwbwy8h.js";
@@ -15,7 +15,7 @@ import {
   provisionMark,
   expandProvisioned,
   installSnapshot
-} from "./kdkxh3kb.js";
+} from "./gde73es6.js";
 import {
   assertCreateRole,
   currentUser,
@@ -25,19 +25,20 @@ import {
   lintMigrationDirectory,
   hasError,
   lintRefusal,
-  assertTargetPolicy,
-  assertDirectConnection,
-  selectTarget,
   projectHead,
   loadBuiltSchema,
   loadConfig
-} from "./xdpj5kkm.js";
+} from "./qv2ydck9.js";
 import {
   changesRole,
   batchSizeField,
   assertExtensionsAvailable,
-  planMigration
-} from "./ayz64vzj.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;
@@ -379,6 +382,18 @@ 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/{tq9afp8d.js → cr74e96e.js}

@@ -11,7 +11,7 @@ import {
   quote,
   isRecord,
   fail
-} from "./qgvt8nx1.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,