okmodel 0.8.0 → 0.9.0

package/dist/shared/{p3xbdcvt.js → myk8fswx.js}

@@ -10,11 +10,11 @@ import {
   materializedViewIndex
 } from "./12z7aznj.js";
 import {
-  columnPrivilege
-} from "./dpc2r7rb.js";
+  quoteIdent2
+} from "./fk9vef30.js";
 import {
-  quoteIdent
-} from "./sjk86yrx.js";
+  columnPrivilege
+} from "./6nae0spm.js";
 import {
   policyObject
 } from "./bdk4sty6.js";
@@ -265,7 +265,10 @@ async function introspectSchema(runner, concrete, logical = "public", options) {
       ...expression.length > 0 ? { expression } : {},
       ...refTable.length > 0 ? {
         references: {
-          parent: { namespace, name: refTable },
+          parent: {
+            namespace: referencedNamespace(text(row, "ref_schema"), concrete, namespace),
+            name: refTable
+          },
           columns: refColumns,
           ...onDelete !== undefined ? { onDelete } : {},
           ...onUpdate !== undefined ? { onUpdate } : {}
@@ -446,8 +449,38 @@ async function introspectSchema(runner, concrete, logical = "public", options) {
   if (options?.managedRoles !== undefined) {
     objects.push(...await readPrivileges(runner, concrete, logical, namespace, provenance, objects, options.managedRoles, options.reportingRole));
   }
+  await includeOutsideReferences(runner, logical, provenance, objects);
   return catalog(objects);
 }
+async function includeOutsideReferences(runner, logical, provenance, objects) {
+  const wanted = new Map;
+  for (const object of objects) {
+    if (object.kind !== "constraint" || object.definition.references === undefined)
+      continue;
+    const parent = object.definition.references.parent;
+    if (parent.namespace.form !== "static" || parent.namespace.name === logical)
+      continue;
+    wanted.set(`${parent.namespace.name}.${parent.name}`, {
+      schema: parent.namespace.name,
+      name: parent.name
+    });
+  }
+  for (const target of wanted.values()) {
+    const namespace = staticNamespace2(target.schema);
+    const parent = { namespace, name: target.name };
+    objects.push(table3({ namespace, name: target.name, provenance }));
+    const rows = await runner.query(OUTSIDE_COLUMNS, [target.schema, target.name]);
+    for (const row of rows) {
+      objects.push(column2({
+        parent,
+        name: text(row, "name"),
+        dataType: text(row, "type"),
+        nullable: !flag(row, "not_null"),
+        provenance
+      }));
+    }
+  }
+}
 var EMITTED = new Set(["SELECT", "INSERT", "UPDATE", "DELETE", "EXECUTE", "USAGE"]);
 var ROLES = `select rolname, rolcanlogin, rolinherit from pg_roles where rolname !~ '^pg_'`;
 var RELATION_GRANTS = `select c.relname as name,
@@ -704,7 +737,7 @@ function indexExpression(row, columns) {
   const opclasses = list(text(row, "opc"));
   const body = columns.map((name, index) => {
     const opclass = opclasses[index];
-    return opclass === undefined ? quoteIdent(name) : `${quoteIdent(name)} ${opclass}`;
+    return opclass === undefined ? quoteIdent2(name) : `${quoteIdent2(name)} ${opclass}`;
   }).join(", ");
   return `using ${method} (${body.length > 0 ? body : stored})`;
 }
@@ -761,6 +794,20 @@ var COLUMNS = `
     and ${CHILD}
     and ${member("c.oid", "pg_class")}
 `;
+function referencedNamespace(refSchema, concrete, logical) {
+  if (refSchema.length > 0 && refSchema !== concrete)
+    return staticNamespace2(refSchema);
+  return logical;
+}
+var OUTSIDE_COLUMNS = `
+  select a.attname as name, format_type(a.atttypid, a.atttypmod) as type, a.attnotnull as not_null
+  from pg_attribute a
+  join pg_class c on c.oid = a.attrelid
+  join pg_namespace n on n.oid = c.relnamespace
+  where n.nspname = $1 and c.relname = $2
+    and a.attnum > 0 and not a.attisdropped
+  order by a.attnum
+`;
 var CONSTRAINTS = `
   select rel.relname as parent, con.conname as name, con.contype as contype,
     con.condeferrable as deferrable, con.condeferred as deferred,
@@ -771,6 +818,7 @@ var CONSTRAINTS = `
       join pg_attribute a on a.attrelid = con.conrelid and a.attnum = cols.attnum
     ) as columns,
     ref.relname as ref_table,
+    refn.nspname as ref_schema,
     (
       select coalesce(string_agg(a.attname, ',' order by cols.ord), '')
       from unnest(con.confkey) with ordinality as cols(attnum, ord)
@@ -780,6 +828,7 @@ var CONSTRAINTS = `
   join pg_class rel on rel.oid = con.conrelid
   join pg_namespace n on n.oid = rel.relnamespace
   left join pg_class ref on ref.oid = con.confrelid
+  left join pg_namespace refn on refn.oid = ref.relnamespace
   where n.nspname = $1
     and con.contype in ('p', 'u', 'f', 'c')
     and not exists (select 1 from pg_inherits i where i.inhrelid = rel.oid)

package/dist/shared/{njga14v4.js → n306gqkd.js}

@@ -4,16 +4,16 @@ import {
   applyProject2,
   pushProject2,
   backfillTiming2
-} from "./pan0370z.js";
-import"./mnvjvqyp.js";
-import"./kj9d8maq.js";
-import"./p3xbdcvt.js";
-import"./f4jy1j7x.js";
-import"./dpc2r7rb.js";
+} from "./ccsmhv9r.js";
+import"./3456242y.js";
+import"./jpybhf98.js";
+import"./myk8fswx.js";
+import"./2zdxkt7b.js";
+import"./6nae0spm.js";
 import"./n442h54c.js";
-import"./sjk86yrx.js";
+import"./fk9vef30.js";
 import"./12z7aznj.js";
-import"./35q0n9tz.js";
+import"./dd5pmnky.js";
 export {
   applyProject2 as applyProject,
   applyTarget2 as applyTarget,