okmodel 0.5.0 → 0.6.0

package/dist/shared/{s6gqfn5j.js → c58secgj.js}

@@ -1,7 +1,7 @@
 import {
   isConnectionSqlstate,
   isConnectionFailure
-} from "./tbszx8mz.js";
+} from "./gwn6v667.js";
 import {
   OkmError2,
   stripRowValues,
@@ -9,19 +9,21 @@ import {
 } from "./52szzakm.js";
 
 // src/dialects/pg/errors.ts
-function mapPostgresError(error, options) {
+function mapPostgresError2(error, options) {
   if (error instanceof OkmError2)
     return error;
   if (!isDriverError(error))
     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, columns, options?.schema));
   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,54 @@ 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 };
+  const refresh = refreshHint(error);
+  if (refresh !== undefined)
+    return refresh;
+  if (kind === "unavailable" && error.sqlstate === undefined && isTlsFailure(error)) {
+    return { reason: "tls", fix: TLS_FIX };
+  }
+  return;
+}
+function refreshHint(error) {
+  if (error.sqlstate === "0A000" && error.message.includes("materialized view is not populated")) {
+    return {
+      reason: "not_populated",
+      fix: { summary: "Refresh once without CONCURRENTLY so the view is populated." }
+    };
+  }
+  if (error.sqlstate === "55000" && error.message.includes("cannot refresh materialized view") && error.message.includes("concurrently")) {
+    return {
+      reason: "no_unique_index",
+      fix: {
+        summary: "Add a unique index with no WHERE clause, or refresh without CONCURRENTLY."
+      }
+    };
+  }
+  if (error.sqlstate === "42501" && error.message.includes("materialized view")) {
+    return {
+      reason: "not_owner",
+      fix: {
+        summary: "Refresh runs as the owner, the migration role. Connect as that role and call refresh(), or run REFRESH MATERIALIZED VIEW as that role. The application role is not the owner."
+      }
+    };
+  }
+  return;
+}
 function kindFromSqlstate(sqlstate) {
   switch (sqlstate) {
     case "23505":
@@ -88,7 +140,15 @@ function kindFromSqlstate(sqlstate) {
       return;
   }
 }
-function reasonOf(kind, table, constraint) {
+function reasonOf(kind, table, constraint, columns, schema) {
+  if (schema !== undefined && schema.catalog !== undefined && table !== undefined) {
+    const matched = matchObject(schema.catalog, table, constraint, columns);
+    if (matched !== undefined)
+      return reasonFromObject(schema, table, matched, columns);
+  }
+  return reasonFromName(kind, table, constraint);
+}
+function reasonFromName(kind, table, constraint) {
   if (constraint === undefined || constraint.length === 0)
     return kind;
   if (table !== undefined) {
@@ -104,6 +164,61 @@ function reasonOf(kind, table, constraint) {
   }
   return constraint;
 }
+function matchObject(catalog, table, constraint, columns) {
+  const rows = [];
+  for (const object of catalog.objects) {
+    if (object.kind !== "constraint" && object.kind !== "index")
+      continue;
+    if (object.identity.parent.name !== table)
+      continue;
+    rows.push(object);
+  }
+  if (columns.length > 0) {
+    const key = columns.join(",");
+    const hits = rows.filter((object) => object.definition.columns.join(",") === key);
+    if (constraint !== undefined) {
+      const named = hits.find((object) => object.identity.name === constraint);
+      if (named !== undefined)
+        return named;
+    }
+    const only = hits.length === 1 ? hits[0] : undefined;
+    if (only !== undefined)
+      return only;
+  }
+  if (constraint === undefined)
+    return;
+  return rows.find((object) => object.identity.name === constraint);
+}
+function reasonFromObject(schema, table, object, columns) {
+  if (object.kind === "index")
+    return object.identity.name;
+  const nameKey = object.definition.nameKey;
+  if (columns.length === 0)
+    return nameKey;
+  const sqlKey = object.definition.columns.join("_");
+  if (nameKey !== sqlKey || object.definition.columns.length < 2)
+    return nameKey;
+  return fieldKey(schema, table, object.definition.columns) ?? nameKey;
+}
+function fieldKey(schema, table, columns) {
+  let model;
+  for (const item of Object.values(schema.model)) {
+    if (item.sql === table) {
+      model = item;
+      break;
+    }
+  }
+  if (model === undefined)
+    return;
+  const fields = [];
+  for (const column of columns) {
+    const found = model.columns.find((item) => item.sql === column);
+    if (found === undefined)
+      return;
+    fields.push(found.field);
+  }
+  return fields.join("_");
+}
 function nameKeyOf(rest) {
   const tags = ["_fkey", "_check", "_key"];
   for (const tag of tags) {
@@ -188,6 +303,9 @@ function unquote(name) {
 }
 function summaryOf(kind, error, columns, fieldReason) {
   const label = labelOf(kind);
+  if (kind === "driver" && fieldReason === "not_owner") {
+    return "The application role cannot refresh a materialized view. Refresh runs as the owner, the migration role.";
+  }
   if (kind === "driver")
     return stripRowValues(error.message);
   const where = place(error.table, columns);
@@ -252,6 +370,5 @@ function labelOf(kind) {
       return "Driver error";
   }
 }
-export {
-  mapPostgresError
-};
+
+export { mapPostgresError2 };

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/d5azex6s.js

@@ -0,0 +1,6 @@
+import {
+  mapPostgresError2
+} from "./c58secgj.js";
+export {
+  mapPostgresError2 as mapPostgresError
+};

package/dist/shared/{5fqx9yh4.js → dk8v79p3.js}

@@ -7,9 +7,11 @@ import {
   startupCatalog2,
   startupHash2,
   loadTrustedCatalog2,
+  catalogFileText2,
   parseCatalog2
-} from "./8bwbwy8h.js";
+} from "./qq3899ht.js";
 export {
+  catalogFileText2 as catalogFileText,
   catalogHash2 as catalogHash,
   creationOrder2 as creationOrder,
   loadTrustedCatalog2 as loadTrustedCatalog,

package/dist/shared/{4m9fn52z.js → ed0b8k4s.js}

@@ -1,6 +1,6 @@
 import {
   required
-} from "./c9z5g0fm.js";
+} from "./ywr8hmey.js";
 import {
   definition,
   rejected

package/dist/shared/{z2rnngj4.js → ek2wt2dz.js}

@@ -1,3 +1,6 @@
+import {
+  catalogFileText2
+} from "./qq3899ht.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -11,7 +14,7 @@ async function assertCompatible(pool, schema, recordedHash, source, options) {
   if (code.artifact !== undefined) {
     const artifact = code.artifact;
     await loadOnce(`text\x00${artifact.hash}`, async () => {
-      const { loadTrustedCatalog } = await import("./5fqx9yh4.js");
+      const { loadTrustedCatalog } = await import("./dk8v79p3.js");
       loadTrustedCatalog(artifact.text, artifact.hash);
     });
   } else if (code.fromFile) {
@@ -25,7 +28,7 @@ async function assertCompatible(pool, schema, recordedHash, source, options) {
           }
         });
       }
-      const { loadTrustedCatalog } = await import("./5fqx9yh4.js");
+      const { loadTrustedCatalog } = await import("./dk8v79p3.js");
       loadTrustedCatalog(text, code.hash);
     });
   }
@@ -39,7 +42,7 @@ async function codeHash(schema, source) {
   const listed = await readHashFile(source.catalogDir);
   if (listed !== undefined)
     return { hash: listed, fromFile: true };
-  const { catalogHash } = await import("./5fqx9yh4.js");
+  const { catalogHash } = await import("./dk8v79p3.js");
   return { hash: catalogHash(schemaCatalog(schema)), fromFile: false };
 }
 function schemaCatalog(schema) {
@@ -57,12 +60,12 @@ async function readHashFile(catalogDir) {
   const text = await readText(`${artifactDir(catalogDir)}/catalog.hash`);
   if (text === undefined)
     return;
-  const hash = text.trim();
+  const hash = catalogFileText2(text, "catalog.hash").trim();
   return hash.length === 0 ? undefined : hash;
 }
 function artifactDir(catalogDir) {
   if (catalogDir !== undefined)
-    return catalogDir.replace(/\/$/, "");
+    return catalogDir.replace(/[/\\]+$/, "");
   const cwd = globalThis.process?.cwd?.() ?? ".";
   return `${cwd}/.okm`;
 }

package/dist/shared/{wxn4b7pp.js → f0f1n281.js}

@@ -4,22 +4,26 @@ import {
   viewDependencyEdges,
   PUBLIC,
   introspectSchema
-} from "./fancm5pt.js";
+} from "./vjpnzwjz.js";
 import {
-  planMigration
-} from "./ayz64vzj.js";
+  planMigration,
+  sessionFailure,
+  finishQuiet,
+  assertDirectConnection,
+  assertStableBackend
+} from "./ttmg09vd.js";
 import {
   quoteIdent,
   createObjectSql
-} from "./8xsbagad.js";
+} from "./9s0ypp87.js";
 import {
   normaliseViewQuery,
   viewObject,
   materializedViewObject
-} from "./y005b761.js";
+} from "./zy8r7qvz.js";
 import {
   catalog
-} from "./g7ez901n.js";
+} from "./ywspezzx.js";
 import {
   OkmError2
 } from "./52szzakm.js";
@@ -49,8 +53,11 @@ async function sealViews(runner, source) {
     return source;
   await dropScratch(runner);
   await runner.query(`create schema ${quoteIdent(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);
   try {
-    await runner.query(`set search_path to ${quoteIdent(SCRATCH)}`);
+    await runner.query(`select set_config('search_path', $1, false)`, [path]);
     await createObjects(runner, source, "type");
     for (const object of source.objects) {
       if (object.kind !== "table")
@@ -83,7 +90,8 @@ async function sealViews(runner, source) {
           query,
           owner: object.owner,
           provenance: object.provenance,
-          dependencies
+          dependencies,
+          ...object.definition.securityInvoker === true ? { securityInvoker: true } : {}
         });
       }
       return materializedViewObject({
@@ -99,10 +107,37 @@ async function sealViews(runner, source) {
     });
     return catalog(next);
   } finally {
-    await runner.query("set search_path to public");
+    await runner.query(`select set_config('search_path', $1, false)`, [saved]).catch(() => {
+      return;
+    });
     await dropScratch(runner);
   }
 }
+async function scratchSearchPath(runner, source) {
+  const names = new Set;
+  for (const object of source.objects) {
+    if (object.kind !== "column")
+      continue;
+    const bare = object.definition.dataType.split(".").pop()?.replace(/\(.*$/, "").replace(/\[\]$/, "").trim().toLowerCase();
+    if (bare !== undefined && bare.length > 0)
+      names.add(bare);
+  }
+  const extra = [];
+  if (names.size > 0) {
+    const rows = await runner.query(`select distinct n.nspname as schema
+       from pg_type t
+       join pg_namespace n on n.oid = t.typnamespace
+       where t.typname = any(string_to_array($1, E'\\x1f'))
+         and n.nspname not in ('pg_catalog', 'information_schema', 'pg_toast')`, [[...names].join("\x1F")]);
+    for (const row of rows) {
+      const schema = cellText(row.schema);
+      if (schema.length > 0 && schema !== "public" && schema !== SCRATCH)
+        extra.push(schema);
+    }
+  }
+  extra.sort();
+  return [SCRATCH, ...extra, "public"].map((name) => quoteIdent(name)).join(", ");
+}
 async function createObjects(runner, source, kind) {
   for (const object of source.objects) {
     if (object.kind !== kind)
@@ -193,7 +228,8 @@ async function dropScratch(runner) {
 }
 
 // src/tooling/migrate/drift.ts
-async function assertAuthorDrift2(url, author, roles) {
+async function assertAuthorDrift2(url, author, roles, allowPooler = false) {
+  assertDirectConnection(url, allowPooler);
   const sql = postgres(url, {
     max: 1,
     connect_timeout: 5,
@@ -201,6 +237,10 @@ async function assertAuthorDrift2(url, author, roles) {
     onnotice: () => {}
   });
   try {
+    await assertStableBackend(async () => {
+      const rows = await sql`select pg_backend_pid()::text as pid`;
+      return rows[0]?.pid ?? "";
+    }, allowPooler);
     const present = await sql`
       select to_regclass('public.okm_meta')::text as reg
     `;
@@ -219,8 +259,10 @@ ${plan.steps.map((step) => step.sql).join(`
         summary: "Change the schema or the database so okm check reports no difference."
       }
     });
+  } catch (error) {
+    throw sessionFailure(error) ?? error;
   } finally {
-    await sql.end({ timeout: 5 });
+    await finishQuiet(() => sql.end({ timeout: 5 }));
   }
 }
 function catalogQuery2(sql) {
@@ -238,12 +280,17 @@ function catalogQuery2(sql) {
 }
 function managedRoleOptions2(roles) {
   const names = managedRoleNames(roles);
-  return names === undefined ? undefined : { managedRoles: names };
+  return names === undefined ? undefined : {
+    managedRoles: names,
+    ...roles?.reporting !== undefined ? { reportingRole: roles.reporting } : {}
+  };
 }
 function managedRoleNames(roles) {
   if (roles === undefined)
     return;
   const names = new Set([roles.migration, roles.app]);
+  if (roles.reporting !== undefined)
+    names.add(roles.reporting);
   for (const role of roles.managed ?? [])
     names.add(role.name);
   return [...names];

package/dist/shared/{gdh9mrtp.js → g90m9b0g.js}

@@ -1,11 +1,12 @@
 import {
   open3
-} from "./fa9vt245.js";
+} from "./5j36z8dn.js";
+import"./8dqhth8c.js";
 import {
   PGLITE_CAPABILITIES,
   readCapability2,
   hasCapability2
-} from "./rrstp3kb.js";
+} from "./cgbamx3e.js";
 export {
   PGLITE_CAPABILITIES as capabilities,
   hasCapability2 as hasCapability,

package/dist/shared/{tbszx8mz.js → gwn6v667.js}

@@ -28,7 +28,7 @@ function isConnectionFailure(error) {
   if (!(error instanceof Error))
     return false;
   const message = error.message;
-  return message.includes("ECONNREFUSED") || message.includes("ECONNRESET") || message.includes("CONNECTION_CLOSED") || message.includes("terminating connection") || message.includes("The pool is closed");
+  return message.includes("ECONNREFUSED") || message.includes("ECONNRESET") || message.includes("CONNECT") || message.includes("terminating connection") || message.includes("The pool is closed");
 }
 function isConnectionLost(error) {
   if (isConnectionFailure(error))
@@ -51,4 +51,4 @@ function readCode(error, key) {
   return typeof value === "string" && value.length > 0 ? value : undefined;
 }
 
-export { isConnectionSqlstate, isConnectionFailure, isConnectionLost };
+export { isConnectionSqlstate, isConnectionErrno, isConnectionFailure, isConnectionLost };

package/dist/shared/{c8aghh05.js → h15jx9bc.js}

@@ -1,6 +1,6 @@
 import {
   validationGate
-} from "./9m80mkac.js";
+} from "./ze4hxsmy.js";
 import {
   isOperator
 } from "./cn0n68ft.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/{3p4b1fg0.js → hazqqecq.js}

@@ -2,23 +2,23 @@ import {
   catalog,
   enumType,
   sameEnumLabels
-} from "./g7ez901n.js";
+} from "./ywspezzx.js";
 import {
-  snakeCase,
-  emittedTypeName,
-  rejectLater
-} from "./jsd07prz.js";
-import {
-  withLocation
-} from "./k7dwkhvq.js";
+  isRelationCall
+} from "./k68eedmy.js";
 import {
   encodeText,
   decodeText
-} from "./4m9fn52z.js";
+} from "./ed0b8k4s.js";
+import {
+  snakeCase,
+  emittedTypeName,
+  rejectLater
+} from "./rpycarcr.js";
 import {
   ColumnBuilder2,
   formatType
-} from "./c9z5g0fm.js";
+} from "./ywr8hmey.js";
 import {
   definition,
   unavailable
@@ -26,6 +26,9 @@ import {
 import {
   quoteLiteral
 } from "./94ez8kzh.js";
+import {
+  withLocation
+} from "./y6jdds7g.js";
 import {
   staticNamespace2,
   table3,
@@ -34,7 +37,7 @@ import {
   constraint2,
   sequence2,
   compareText
-} from "./t4tbsy9h.js";
+} from "./358zsv4r.js";
 import {
   assertIdentifier2,
   fitIdentifier2,
@@ -49,85 +52,6 @@ import {
   readClientGenerator
 } from "./rwmrejjz.js";
 
-// src/dialects/pg/through.ts
-var emit = (planner, schema, relation, child, sink, parent, alias, depth) => {
-  const through = relation.through;
-  const join = through === undefined ? undefined : planner.indexes(schema).get(through.table);
-  if (through === undefined || join === undefined) {
-    return catalogError2("OKM1020", `Relation ${relation.name} names a join table that is not in the schema.`);
-  }
-  const { quote } = planner;
-  const joinAlias = `j${alias}`;
-  sink.mark(`via:${through.table}`);
-  sink.text(`${quote(join.model.sql)} ${joinAlias} join ${quote(child.model.sql)} ${alias} on `);
-  for (let index = 0;index < through.local.length; index += 1) {
-    const local = through.local[index];
-    const remote = through.remote[index];
-    if (local === undefined || remote === undefined)
-      continue;
-    if (index > 0)
-      sink.text(" and ");
-    sink.text(`${alias}.${quote(remote)} = ${joinAlias}.${quote(local)}`);
-  }
-  sink.text(" where ");
-  planner.join(sink, parent, joinAlias, relation);
-  planner.where(schema, join, undefined, sink, joinAlias, depth + 1, true);
-};
-function resolveThrough(scope, table, through, from, to) {
-  for (const name of [table, through]) {
-    if (!scope.tables.includes(name)) {
-      throwNamed2("OKM1020", name, scope.tables, `Relation ${scope.owner}.${scope.name} names ${name}, which is not in the schema. Accepted names: ${scope.tables.join(", ")}.`);
-    }
-  }
-  const toOwner = pick(scope, through, scope.owner, from, `${scope.owner}.${scope.name}`, "from");
-  const toTable = pick(scope, through, table, to, `${scope.owner}.${scope.name}`, "to");
-  if (toOwner === toTable) {
-    catalogError2("OKM1021", `Relation ${scope.owner}.${scope.name} uses ${toOwner.fromField} on ${through} for both ends. Pass from and to.`);
-  }
-  return {
-    name: scope.name,
-    kind: "many",
-    table,
-    local: toOwner.remote,
-    remote: toOwner.local,
-    through: { table: through, local: toTable.local, remote: toTable.remote, emit }
-  };
-}
-function pick(scope, through, target, field, label, end) {
-  const matches = scope.edges.filter((edge) => edge.fromTable === through && edge.toTable === target && (field === undefined || edge.fromField === field));
-  const [only] = matches;
-  if (matches.length === 1 && only !== undefined)
-    return only;
-  const fields = matches.map((edge) => edge.fromField).sort();
-  catalogError2("OKM1021", `Relation ${label} through ${through} is ambiguous at ${end}. Accepted columns: ${fields.length === 0 ? "(none)" : fields.join(", ")}.`);
-}
-
-// src/dialects/pg/relations.ts
-function one2(table, field) {
-  return { kind: "one", table, field };
-}
-function many2(table, field) {
-  return { kind: "many", table, field };
-}
-function isRelationCall(value) {
-  if (typeof value !== "object" || value === null)
-    return false;
-  if (!("kind" in value) || !("table" in value))
-    return false;
-  const kind = value.kind;
-  return (kind === "one" || kind === "many") && typeof value.table === "string";
-}
-function manyThrough2(table, options) {
-  const { through, from, to } = options;
-  return {
-    kind: "many",
-    table,
-    field: undefined,
-    through,
-    resolve: (scope) => resolveThrough(scope, table, through, from, to)
-  };
-}
-
 // src/dialects/pg/compile.ts
 function compileColumn(builder, input) {
   const state = builder.state;
@@ -212,7 +136,7 @@ function readTenancy(value) {
     definition("schema() tenancy must be columnTenancy() from okmodel/tenancy.");
   }
   const record = value;
-  if (record.strategy !== "column" || typeof record.rewrite !== "function") {
+  if (typeof record.rewrite !== "function") {
     definition("schema() tenancy must be columnTenancy() from okmodel/tenancy.");
   }
   return value;
@@ -557,7 +481,7 @@ function compileTable(item, namespace, casing, codecs, requires, idDefault, jobs
       references: column.state.references,
       encode: column.state.encode,
       decode: decode === decodeText ? undefined : decode,
-      hidden: column.state.hidden,
+      hidden: column.state.filterable === true ? "filter" : column.state.hidden,
       sensitive: column.state.sensitive,
       guarded: column.state.guarded,
       writable: column.state.guarded !== true && column.state.omitWrite !== true && column.state.generated === undefined,
@@ -1127,4 +1051,4 @@ function list(names) {
   return names.length === 0 ? "(none)" : names.join(", ");
 }
 
-export { one2, many2, manyThrough2, schema2, addSchemaHook };
+export { schema2, addSchemaHook };