okmodel 0.3.0 → 0.4.0

package/dist/shared/{xw1d69vd.js → wqem4jed.js}

@@ -117,7 +117,7 @@ function open2(config) {
     },
     async batch(statements, options) {
       return sockets.occupy(async () => {
-        const { checkout } = await import("./999ade2q.js");
+        const { checkout } = await import("./5vdm4sgp.js");
         const connection = await checkout(held);
         try {
           return await connection.batch(statements, options);
@@ -129,12 +129,12 @@ function open2(config) {
     reserve() {
       const gate = sockets.busyGate();
       gate.enter();
-      return import("./999ade2q.js").then((mod) => mod.holdCheckout(gate, () => mod.checkout(held)), (error) => {
+      return import("./5vdm4sgp.js").then((mod) => mod.holdCheckout(gate, () => mod.checkout(held)), (error) => {
         gate.leave();
         throw error;
       });
     },
-    describe: (text, params) => sockets.occupy(() => import("./999ade2q.js").then((mod) => mod.describe(sql, text, params))),
+    describe: (text, params) => sockets.occupy(() => import("./5vdm4sgp.js").then((mod) => mod.describe(sql, text, params))),
     stream(text, params) {
       const gate = sockets.busyGate();
       return async function* () {
@@ -149,7 +149,7 @@ function open2(config) {
     listen(channel, onNotify) {
       const gate = sockets.listenerGate();
       gate.enter();
-      return import("./999ade2q.js").then((mod) => mod.holdListener(gate, async () => {
+      return import("./5vdm4sgp.js").then((mod) => mod.holdListener(gate, async () => {
         const listening = await sql.listen(channel, onNotify);
         return async () => {
           await listening.unlisten();
@@ -219,7 +219,7 @@ class PgSession {
       onAbort();
     else
       watch.signal.addEventListener("abort", onAbort, { once: true });
-    return import("./999ade2q.js").then((mod) => mod.watchQuery(pending, watch, onAbort, {
+    return import("./5vdm4sgp.js").then((mod) => mod.watchQuery(pending, watch, onAbort, {
       start,
       text,
       notices: this.notices,
@@ -271,7 +271,7 @@ class PgSession {
   }
 }
 async function* loadStream(sql, text, params) {
-  const { stream } = await import("./999ade2q.js");
+  const { stream } = await import("./5vdm4sgp.js");
   yield* stream(sql, text, params);
 }
 function send(sql, text, params, named) {

package/dist/shared/{49ypnfwt.js → xghkt7a9.js}

@@ -2,13 +2,14 @@ import {
   roleObject,
   grantObject,
   defaultPrivilegeObject
-} from "./t616ynfn.js";
+} from "./8jb4ymh2.js";
 import {
   planMigration
-} from "./2ssqrv66.js";
+} from "./n5y9zyj1.js";
 import {
-  quoteIdent
-} from "./wekze34d.js";
+  quoteIdent,
+  createObjectSql
+} from "./41kv2xdm.js";
 import {
   functionObject,
   triggerObject
@@ -21,14 +22,12 @@ import {
 } from "./y005b761.js";
 import {
   extensionObject
-} from "./th14ygv2.js";
-import {
-  catalog
-} from "./jkc6ws1p.js";
+} from "./8ktwd3rh.js";
 import {
+  catalog,
   enumType,
   domainType
-} from "./qbxzvwwc.js";
+} from "./g7ez901n.js";
 import {
   staticNamespace2,
   identityKey2,
@@ -252,6 +251,7 @@ async function introspectSchema(runner, concrete, logical = "public", options) {
     const parent = parents.get(parentName) ?? { namespace, name: parentName };
     const kind = constraintKind(text(row, "contype"));
     const columns = list(text(row, "columns"));
+    const name = text(row, "name");
     const expression = kind === "check" ? checkExpression(text(row, "definition")) : "";
     const refTable = text(row, "ref_table");
     const refColumns = list(text(row, "ref_columns"));
@@ -261,8 +261,8 @@ async function introspectSchema(runner, concrete, logical = "public", options) {
     objects.push(constraint2({
       parent,
       constraintKind: kind,
-      name: text(row, "name"),
-      nameKey: kind === "primaryKey" ? "pkey" : columns.length > 0 ? columns.join("_") : "check",
+      name,
+      nameKey: constraintNameKey(kind, parentName, name, columns),
       columns,
       provenance,
       deferrable: flag(row, "deferrable"),
@@ -861,6 +861,19 @@ function partitionMethod(value) {
     return "hash";
   return;
 }
+function constraintNameKey(kind, parent, name, columns) {
+  if (kind === "primaryKey")
+    return "pkey";
+  const tag = kind === "unique" ? "key" : kind === "foreignKey" ? "fkey" : "check";
+  const prefix = `${parent}_`;
+  const suffix = `_${tag}`;
+  if (name.startsWith(prefix) && name.endsWith(suffix) && name.length > prefix.length + suffix.length) {
+    return name.slice(prefix.length, -suffix.length);
+  }
+  if (columns.length > 0)
+    return columns.join("_");
+  return tag;
+}
 function constraintKind(value) {
   if (value === "p")
     return "primaryKey";
@@ -934,6 +947,13 @@ async function sealViews(runner, source) {
   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;
@@ -1061,11 +1081,11 @@ async function dropScratch(runner) {
       continue;
     await runner.query(`drop table if exists ${quoteIdent(SCRATCH)}.${quoteIdent(cellText(row.name))}`);
   }
-  await runner.query(`drop schema if exists ${quoteIdent(SCRATCH)}`);
+  await runner.query(`drop schema if exists ${quoteIdent(SCRATCH)} cascade`);
 }
 
 // src/tooling/migrate/drift.ts
-async function assertAuthorDrift(url, author, roles) {
+async function assertAuthorDrift2(url, author, roles) {
   const sql = postgres(url, {
     max: 1,
     connect_timeout: 5,
@@ -1078,10 +1098,9 @@ async function assertAuthorDrift(url, author, roles) {
     `;
     if (present[0]?.reg == null)
       return;
-    const runner = queryOf(sql);
-    const managed = managedRoleNames(roles);
+    const runner = catalogQuery2(sql);
     const authorOnServer = await sealViews(runner, author);
-    const live = await introspectSchema(runner, "public", "public", managed === undefined ? undefined : { managedRoles: managed });
+    const live = await introspectSchema(runner, "public", "public", managedRoleOptions2(roles));
     const plan = planMigration({ before: live, after: authorOnServer, name: "check" });
     if (plan.steps.length === 0)
       return;
@@ -1096,15 +1115,7 @@ ${plan.steps.map((step) => step.sql).join(`
     await sql.end({ timeout: 5 });
   }
 }
-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];
-}
-function queryOf(sql) {
+function catalogQuery2(sql) {
   return {
     async query(text, params) {
       const rows = await sql.unsafe(text, params === undefined ? undefined : [...params]);
@@ -1117,6 +1128,17 @@ function queryOf(sql) {
     }
   };
 }
-export {
-  assertAuthorDrift
-};
+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 };

package/dist/shared/{7fvtrkwr.js → ycatkxmq.js}

@@ -1,6 +1,6 @@
 import {
   extensionObject
-} from "./th14ygv2.js";
+} from "./8ktwd3rh.js";
 import {
   OkmError2
 } from "./52szzakm.js";