okmodel 0.5.1 → 0.7.0

package/dist/dialects/pg/column.d.ts

@@ -207,6 +207,12 @@ export type ColumnState<TValue> = {
     } | undefined;
     readonly guarded: boolean;
     readonly hidden: boolean;
+    /**
+     * Hidden, and allowed in `where` and `orderBy`.
+     *
+     * Absent otherwise. Not part of the catalog or its hash.
+     */
+    readonly filterable?: true;
     /** Redacted in logs, errors, and `inspect()`. Not part of the catalog hash. */
     readonly sensitive: boolean;
     readonly omitWrite: boolean;
@@ -383,11 +389,16 @@ export declare class ColumnBuilder<TValue, TFlags extends ColumnFlags> {
     /**
      * Excludes the column from the default row.
      *
-     * A named `select` still returns it. Includes never do.
+     * A named `select` still returns it. Includes never do. `where` and
+     * `orderBy` refuse it (OKM1120) unless `filterable` is set. `filters()`
+     * still refuses it.
      *
+     * @param options - `filterable` allows the column in `where` and `orderBy`
      * @returns The same column, hidden
      */
-    hidden(): ColumnBuilder<TValue, FlagTrue<TFlags, "hidden">>;
+    hidden(options?: {
+        readonly filterable?: boolean;
+    }): ColumnBuilder<TValue, FlagTrue<TFlags, "hidden">>;
     /**
      * Redacts the value in logs, errors, and `inspect()`.
      *

package/dist/dialects/pg/ddl.d.ts

@@ -4,7 +4,7 @@
  * Planning and scratch comparison both render through here, so a statement
  * has one spelling.
  */
-import type { Catalog, CatalogObject, ColumnObject, FunctionObject, MaterializedViewObject, SequenceObject, TableObject, ViewObject } from "../../contracts/catalog/types.js";
+import type { Catalog, CatalogObject, ColumnObject, FunctionObject, MaterializedViewObject, PolicyObject, SequenceObject, TableObject, ViewObject } from "../../contracts/catalog/types.js";
 /**
  * Quotes one identifier.
  *
@@ -23,6 +23,18 @@ export declare function quoteIdent(name: string): string;
  * @returns SQL statements
  */
 export declare function renderCatalog(source: Catalog, schema: string): readonly string[];
+/**
+ * Pulls a unique constraint in front of a foreign key that references it.
+ *
+ * The primary key is created with the table. A foreign key aimed at another
+ * unique has to wait for that unique. Create order ties those two by name, so
+ * the foreign key can otherwise come first. The planner uses this for creates
+ * and for the list it reverses when it drops.
+ *
+ * @param objects - Create order
+ * @returns The same objects, with those uniques moved forward
+ */
+export declare function uniqueBeforeForeignKey(objects: readonly CatalogObject[]): readonly CatalogObject[];
 /**
  * Reports whether an index belongs to a view or a materialized view.
  *
@@ -74,6 +86,30 @@ export declare function functionSql(object: FunctionObject, schema: string, repl
  * @returns The statement
  */
 export declare function viewSql(object: ViewObject, schema: string, replace: boolean): string;
+/** One policy statement and the planner kind that classifies it. */
+export type PolicyPlanStep = {
+    readonly sql: string;
+    readonly kind: "enable-rls" | "create-policy" | "drop-policy" | "disable-rls";
+};
+/**
+ * `ENABLE`, `FORCE`, and `CREATE POLICY` for one policy.
+ *
+ * The `all` command policy also enables and forces row-level security.
+ * The `select` policy is the unscoped read. Names are the stored identity.
+ *
+ * @param object - Policy to create
+ * @param schema - Concrete schema name
+ * @returns Statements in apply order
+ */
+export declare function policyCreatePlan(object: PolicyObject, schema: string): readonly PolicyPlanStep[];
+/**
+ * `DROP POLICY`, and for the `all` command policy `NO FORCE` and `DISABLE`.
+ *
+ * @param object - Policy to drop
+ * @param schema - Concrete schema name
+ * @returns Statements in apply order
+ */
+export declare function policyDropPlan(object: PolicyObject, schema: string): readonly PolicyPlanStep[];
 /**
  * `CREATE MATERIALIZED VIEW ... WITH NO DATA`.
  *

package/dist/dialects/pg/emit.d.ts

@@ -6,6 +6,14 @@
  */
 import { type BuiltSchema } from "./schema.js";
 import { type AnyTable } from "./table.js";
+/**
+ * Type arguments read from `t.json<T>()` and `t.jsonb<T>()` in schema source.
+ *
+ * The key is `table.field`. QA-L3 kept the wrapper for a bare `t.jsonb()`,
+ * which has no argument and stays `jsonb<unknown>`. The documented call
+ * `t.jsonb<{ published?: boolean }>()` is this map.
+ */
+export type JsonColumnTypes = ReadonlyMap<string, string>;
 /**
  * Emits row, insert, and update interfaces for every table.
  *
@@ -13,6 +21,16 @@ import { type AnyTable } from "./table.js";
  * and `TasksUpdate`.
  *
  * @param source - Schema from {@link schema}
+ * @param jsonTypes - Type arguments from the schema source. Omitted, json and jsonb stay `unknown`
  * @returns Declaration text
  */
-export declare function emitRowTypes(source: BuiltSchema<readonly AnyTable[]>): string;
+export declare function emitRowTypes(source: BuiltSchema<readonly AnyTable[]>, jsonTypes?: JsonColumnTypes): string;
+/**
+ * Reads `t.json<T>()` and `t.jsonb<T>()` type arguments from schema source.
+ *
+ * A bare `t.jsonb()` has no argument. The key is the table name and the field.
+ *
+ * @param source - Schema source, comments removed by the caller or still present
+ * @returns `table.field` to the type argument text
+ */
+export declare function jsonColumnTypes(source: string): JsonColumnTypes;

package/dist/dialects/pg/errors.d.ts

@@ -2,9 +2,30 @@
  * Maps a Postgres {@link DriverError} to an {@link OkmError} (spec §4.2, §14).
  *
  * Adapters normalise the driver into `DriverError`. They do not construct
- * `OkmError`. Constraint names follow the catalog: `{table}_{nameKey}_{tag}`.
+ * `OkmError`. `connect()` passes its schema. A reason then comes from the
+ * error's columns matched to a catalog object. With no catalog, the
+ * constraint name is parsed.
  */
+import type { Catalog } from "../../contracts/catalog/types.js";
 import { OkmError, type ErrorStatuses } from "../../contracts/error.js";
+/**
+ * Catalog and model used to name a unique, foreign key, or check.
+ *
+ * `connect()` passes the schema it already holds. The reference is enough:
+ * matching stays in this module.
+ */
+export type MapPostgresErrorSchema = {
+    readonly catalog: Catalog;
+    readonly model: Readonly<Record<string, {
+        readonly sql: string;
+        readonly columns: readonly SqlField[];
+    }>>;
+};
+/** One column the reason mapper can turn back into a TypeScript field. */
+type SqlField = {
+    readonly field: string;
+    readonly sql: string;
+};
 /** Options for {@link mapPostgresError}. */
 export type MapPostgresErrorOptions = {
     /**
@@ -15,6 +36,15 @@ export type MapPostgresErrorOptions = {
     readonly includeValues?: boolean;
     /** Category overrides from `connect({ errors })`. */
     readonly http?: ErrorStatuses;
+    /**
+     * Schema whose catalog still has the stored name key.
+     *
+     * Columns in the error select the object. The stored name key is the
+     * reason. A composite key that is only the SQL column list becomes the
+     * TypeScript fields. With no columns, the stored name key is the reason.
+     * An index keeps its full name.
+     */
+    readonly schema?: MapPostgresErrorSchema;
 };
 /**
  * Maps a thrown driver error into an {@link OkmError}.
@@ -28,3 +58,4 @@ export type MapPostgresErrorOptions = {
  * @returns A categorised error
  */
 export declare function mapPostgresError(error: unknown, options?: MapPostgresErrorOptions): OkmError;
+export {};

package/dist/dialects/pg/ext/citext.js

@@ -1,6 +1,6 @@
 import {
   extension2
-} from "../../../shared/ycatkxmq.js";
+} from "../../../shared/jgqj11w4.js";
 
 // src/dialects/pg/ext/citext.ts
 function citext(options = {}) {

package/dist/dialects/pg/ext/index.js

@@ -1,6 +1,6 @@
 import {
   extension2
-} from "../../../shared/ycatkxmq.js";
+} from "../../../shared/jgqj11w4.js";
 export {
   extension2 as extension
 };

package/dist/dialects/pg/ext/pg-trgm.js

@@ -1,6 +1,6 @@
 import {
   extension2
-} from "../../../shared/ycatkxmq.js";
+} from "../../../shared/jgqj11w4.js";
 import {
   tag
 } from "../../../shared/cn0n68ft.js";

package/dist/dialects/pg/filter-parse.d.ts

@@ -5,9 +5,9 @@
  * before this module exists.
  *
  * A request key is equality when the value is a scalar and `eq` is allowed.
- * An object value names operators: `eq`, `in` (`inList`), `notIn`, `lt`,
- * `lte`, `gt`, `gte`, `between`, `startsWith`, `endsWith`, `contains`,
- * `like`, and `ilike`. `sort` is a field name from the sort list.
+ * An object value names operators `parse` applies. `sort` is a field name
+ * from the sort list. A relation key becomes `has` over the allowlisted fields.
+ * A column key wins when the same name is in `allow` and `relations`.
  */
 import type { ParsedFilters } from "./table.js";
 /**
@@ -20,6 +20,7 @@ import type { ParsedFilters } from "./table.js";
  * @param allow - Fields and the operators each one accepts
  * @param sort - Fields a caller may sort by
  * @param query - One request object
+ * @param relations - Relation name to fields, when `filters` passed any
  * @returns Filters a caller can spread into `find`
  */
-export declare function parseQuery(allow: Readonly<Record<string, readonly string[]>>, sort: readonly string[], query: unknown): ParsedFilters;
+export declare function parseQuery(allow: Readonly<Record<string, readonly string[]>>, sort: readonly string[], query: unknown, relations?: Readonly<Record<string, readonly string[]>>): ParsedFilters;

package/dist/dialects/pg/floor.d.ts

@@ -0,0 +1,68 @@
+/**
+ * Postgres majors a schema may name, and the features that read them.
+ *
+ * 15–18 are the majors okmodel runs. A major outside that range is refused
+ * when `schema()` runs. Messages read these numbers. They do not repeat them.
+ */
+/** Majors `minPostgres` and `requires.postgres` accept, oldest first. */
+export declare const POSTGRES_MAJORS: readonly [15, 16, 17, 18];
+/** A major {@link POSTGRES_MAJORS} allows. */
+export type PostgresMajor = (typeof POSTGRES_MAJORS)[number];
+/**
+ * Oldest major connect accepts when the schema names no floor.
+ *
+ * A server below this is OKM1803.
+ */
+export declare const POSTGRES_FLOOR = 15;
+/**
+ * `uuidv7()` database default.
+ *
+ * Add the next feature constant beside this one, and name it on the minPostgres page.
+ */
+export declare const UUIDV7_POSTGRES = 18;
+/**
+ * Accepts a major from {@link POSTGRES_MAJORS}.
+ *
+ * @param value - Candidate from schema input
+ * @returns Whether `value` is 15, 16, 17, or 18
+ */
+export declare function isPostgresMajor(value: unknown): value is PostgresMajor;
+/**
+ * Reads a stored `>=N` floor.
+ *
+ * `readFloor`, `refuseUuidV7`, and `acceptServer` share this parse.
+ *
+ * @param postgres - Stored or input range
+ * @returns The major, or `NaN` when the text is not `>=` plus digits
+ */
+export declare function parsePostgresFloor(postgres: string | undefined): number;
+/**
+ * Stores a major as `>=N`.
+ *
+ * @param major - Allowed major
+ * @returns The stored floor text
+ */
+export declare function formatPostgresFloor(major: number): string;
+/**
+ * Definition error for a floor outside 15–18.
+ *
+ * @returns OKM1060 message
+ */
+export declare function minPostgresDefinition(): string;
+/**
+ * Sentence for a `uuidv7()` default the declared floor does not allow.
+ *
+ * @returns The OKM1812 message
+ */
+export declare function uuidv7NeedsPostgres(): string;
+/**
+ * Connect refusal when the server is below the schema floor.
+ *
+ * OKM1802 and OKM1803 share this sentence. OKM1803 passes {@link POSTGRES_FLOOR}.
+ * Loaded with the connect check, not with `schema()`.
+ *
+ * @param server - Major the server reported
+ * @param need - Major the schema requires
+ * @returns The message
+ */
+export declare function serverNeedsPostgres(server: number, need: number): string;

package/dist/dialects/pg/fn/index.js

@@ -1,10 +1,10 @@
 import {
   functionObject,
   triggerObject
-} from "../../../shared/9x25fxhc.js";
+} from "../../../shared/y34a8714.js";
 import {
   staticNamespace2
-} from "../../../shared/t4tbsy9h.js";
+} from "../../../shared/358zsv4r.js";
 import {
   assertIdentifier2
 } from "../../../shared/nfzc5z0w.js";

package/dist/dialects/pg/index.d.ts

@@ -4,8 +4,10 @@
  * Column types, codecs, picklists, `table()`, and `schema()`.
  * Each builder is a separate export so a bundle can keep only the ones it calls.
  */
+export { type PostgresMajor } from "./floor.js";
 export { schema, type BuiltSchema, type SchemaCodecs, type SchemaInput, type SchemaRequires, } from "./schema.js";
-export { index, sql, table, type AnyTable, type ColumnHandle, type IndexCall, type SqlText, type SqlValue, type Table, type TableOptions, } from "./table.js";
+export { withOwner, type DeclaredOwner } from "./owner.js";
+export { index, sql, table, type AnyTable, type ColumnHandle, type IndexCall, type SqlText, type SqlValue, type FilterOperator, type Table, type TableOptions, } from "./table.js";
 export type { PresetQuery } from "./preset.js";
 export { custom } from "./custom.js";
 export { ColumnBuilder } from "./column.js";
@@ -26,6 +28,8 @@ export { domain, enumColumn as enum } from "./enum.js";
 export { t } from "./namespace.js";
 export * as arr from "./ops/arr-ns.js";
 export * as json from "./ops/json-ns.js";
+export { bucket, type Bucket, type BucketUnit, type WeekStart } from "./ops/bucket.js";
+export { denseRank, rank, rowNumber, runningTotal, type Window, type WindowOrder, } from "./ops/window.js";
 export { between } from "./ops/between.js";
 export { containedBy } from "./ops/containedBy.js";
 export { contains } from "./ops/contains.js";
@@ -42,6 +46,8 @@ export { ilike } from "./ops/ilike.js";
 export { inList } from "./ops/inList.js";
 export { like } from "./ops/like.js";
 export { matches } from "./ops/matches.js";
+export { relevance } from "./ops/relevance.js";
+export type { SearchMatch } from "./operators.js";
 export { lt } from "./ops/lt.js";
 export { lte } from "./ops/lte.js";
 export { none } from "./ops/none.js";
@@ -51,4 +57,4 @@ export { or } from "./ops/or.js";
 export { overlaps } from "./ops/overlaps.js";
 export { path } from "./ops/path.js";
 export { startsWith } from "./ops/startsWith.js";
-export { many, manyThrough, one, type ManyRelation, type ManyThroughRelation, type OneRelation, type RelationCall, } from "./relations.js";
+export { many, manyThrough, morph, morphMany, morphTo, one, type ManyRelation, type ManyThroughRelation, type MorphManyRelation, type MorphRelation, type OneRelation, type RelationCall, } from "./relations.js";

package/dist/dialects/pg/index.js

@@ -1,9 +1,31 @@
+import {
+  searchValue
+} from "../../shared/dzj09cye.js";
+import {
+  rowNumber2,
+  rank2,
+  denseRank2,
+  runningTotal2
+} from "../../shared/9a4ae4p8.js";
 import {
   jsonReplacer2,
   json2,
   jsonb2
-} from "../../shared/gjthds9j.js";
+} from "../../shared/9628a9xt.js";
+import {
+  bucket2
+} from "../../shared/nbw1z4yd.js";
 import {
+  withOwner2
+} from "../../shared/xqve9598.js";
+import {
+  smallint2,
+  integer2,
+  bigint2,
+  identity2,
+  encodeBigintString,
+  decodeBigintString,
+  integerToken,
   encodeInstant,
   decodeInstant,
   encodeDate,
@@ -14,25 +36,25 @@ import {
   time2,
   timetz2,
   interval2
-} from "../../shared/1g0drakv.js";
+} from "../../shared/vqrjpcqn.js";
 import {
-  one2,
-  many2,
-  manyThrough2,
   schema2
-} from "../../shared/5enne4ma.js";
+} from "../../shared/xnxsed62.js";
 import {
   domainType
-} from "../../shared/g7ez901n.js";
+} from "../../shared/ywspezzx.js";
+import {
+  one2,
+  many2,
+  manyThrough2,
+  morph2,
+  morphMany2,
+  morphTo2
+} from "../../shared/exn3sd90.js";
 import {
   id2,
   uuid2
-} from "../../shared/dyj86cmj.js";
-import {
-  table2,
-  index2,
-  sql2
-} from "../../shared/ntneex2a.js";
+} from "../../shared/hyh73qk6.js";
 import {
   text2,
   varchar2,
@@ -40,13 +62,17 @@ import {
   citext2,
   encodeText,
   decodeText
-} from "../../shared/4m9fn52z.js";
+} from "../../shared/ed0b8k4s.js";
+import {
+  table2,
+  index2,
+  sql2
+} from "../../shared/rpycarcr.js";
 import {
   ColumnBuilder2,
   required,
-  openColumn,
   formatType
-} from "../../shared/c9z5g0fm.js";
+} from "../../shared/ywr8hmey.js";
 import {
   definition,
   rejected
@@ -54,7 +80,7 @@ import {
 import {
   sameNamespace2,
   compareText
-} from "../../shared/t4tbsy9h.js";
+} from "../../shared/358zsv4r.js";
 import {
   tag
 } from "../../shared/cn0n68ft.js";
@@ -90,146 +116,6 @@ function custom(spec) {
     ...spec.extension !== undefined ? { extension: spec.extension } : {}
   });
 }
-// src/dialects/pg/integer.ts
-function smallint() {
-  return required({
-    baseType: "smallint",
-    encode: (value) => integerToken(value, -32768, 32767, "smallint"),
-    decode: (wire) => decodeBounded(wire, -32768, 32767, "smallint"),
-    sqlForm: "raw"
-  });
-}
-function integer() {
-  return required({
-    baseType: "integer",
-    encode: (value) => integerToken(value, -2147483648, 2147483647, "integer"),
-    decode: (wire) => decodeBounded(wire, -2147483648, 2147483647, "integer"),
-    sqlForm: "raw"
-  });
-}
-function bigint(options) {
-  const mode = options?.as ?? "string";
-  if (mode === "number") {
-    return required({
-      baseType: "bigint",
-      encode: encodeBigintNumber,
-      decode: decodeBigintNumber,
-      sqlForm: "raw",
-      typeLabel: "number"
-    });
-  }
-  if (mode === "bigint") {
-    return required({
-      baseType: "bigint",
-      encode: encodeBigintValue,
-      decode: decodeBigintValue,
-      sqlForm: "raw",
-      typeLabel: "bigint"
-    });
-  }
-  if (mode !== "string") {
-    definition(`bigint as ${String(mode)} must be string, number, or bigint.`);
-  }
-  return required({
-    baseType: "bigint",
-    encode: encodeBigintString,
-    decode: decodeBigintString,
-    sqlForm: "raw"
-  });
-}
-function identity(options) {
-  const mode = options?.as ?? "string";
-  if (mode === "number") {
-    return openColumn({
-      ...identityFlags(),
-      encode: encodeBigintNumber,
-      decode: decodeBigintNumber,
-      typeLabel: "number"
-    });
-  }
-  if (mode === "bigint") {
-    return openColumn({
-      ...identityFlags(),
-      encode: encodeBigintValue,
-      decode: decodeBigintValue,
-      typeLabel: "bigint"
-    });
-  }
-  if (mode !== "string") {
-    definition(`identity as ${String(mode)} must be string, number, or bigint.`);
-  }
-  return openColumn({
-    ...identityFlags(),
-    encode: encodeBigintString,
-    decode: decodeBigintString
-  });
-}
-function encodeBigintString(value) {
-  parseBigint(value);
-  return value;
-}
-function decodeBigintString(wire) {
-  return encodeBigintString(wire);
-}
-function encodeBigintNumber(value) {
-  if (!Number.isSafeInteger(value)) {
-    rejected(`bigint number ${String(value)} must be an integer from ${String(Number.MIN_SAFE_INTEGER)} to ${String(Number.MAX_SAFE_INTEGER)}.`);
-  }
-  return String(value);
-}
-function decodeBigintNumber(wire) {
-  const parsed = parseBigint(wire);
-  const value = Number(parsed);
-  if (!Number.isSafeInteger(value)) {
-    rejected(`bigint ${wire} must be an integer from ${String(Number.MIN_SAFE_INTEGER)} to ${String(Number.MAX_SAFE_INTEGER)} when as is number.`);
-  }
-  return value;
-}
-function encodeBigintValue(value) {
-  return value.toString();
-}
-function decodeBigintValue(wire) {
-  return parseBigint(wire);
-}
-function integerToken(value, min, max, role) {
-  if (!Number.isInteger(value) || value < min || value > max) {
-    rejected(`${role} ${String(value)} must be an integer from ${String(min)} to ${String(max)}.`);
-  }
-  return String(value);
-}
-function decodeBounded(wire, min, max, role) {
-  if (!integerText().test(wire)) {
-    rejected(`${role} ${wire} must be an integer, for example 0 or -12.`);
-  }
-  const value = Number(wire);
-  integerToken(value, min, max, role);
-  return value;
-}
-function identityFlags() {
-  return {
-    baseType: "bigint",
-    nullable: false,
-    hasDefault: true,
-    generated: false,
-    guarded: false,
-    hidden: false,
-    omitWrite: true,
-    sqlForm: "raw",
-    identity: { always: true },
-    primaryKey: true
-  };
-}
-function parseBigint(wire) {
-  if (!integerText().test(wire)) {
-    rejected(`bigint ${wire} must be an integer with no leading zeros, for example 0 or -12.`);
-  }
-  return BigInt(wire);
-}
-function integerText() {
-  integerPattern ??= /^-?(?:0|[1-9]\d*)$/;
-  return integerPattern;
-}
-var integerPattern;
 // src/dialects/pg/finite.ts
 function decimalText(value, role) {
   if (!Number.isFinite(value)) {
@@ -756,11 +642,11 @@ function canonicalScalar(typeName) {
 // src/dialects/pg/namespace.ts
 var t = {
   id: id2,
-  identity,
+  identity: identity2,
   uuid: uuid2,
-  smallint,
-  integer,
-  bigint,
+  smallint: smallint2,
+  integer: integer2,
+  bigint: bigint2,
   numeric,
   real,
   double,
@@ -882,11 +768,11 @@ function like(pattern) {
 }
 // src/dialects/pg/ops/matches.ts
 function matches(query, options) {
-  return tag("matches", {
-    query,
-    mode: options?.mode ?? "websearch",
-    config: options?.config
-  });
+  return tag("matches", searchValue(query, options));
+}
+// src/dialects/pg/ops/relevance.ts
+function relevance(query, options) {
+  return tag("relevance", searchValue(query, options));
 }
 // src/dialects/pg/ops/lt.ts
 function lt(value) {
@@ -933,8 +819,9 @@ export {
   ColumnBuilder2 as ColumnBuilder,
   exports_arr_ns as arr,
   between,
-  bigint,
+  bigint2 as bigint,
   boolean,
+  bucket2 as bucket,
   bytea,
   char2 as char,
   cidr,
@@ -944,6 +831,7 @@ export {
   custom,
   date2 as date,
   daterange,
+  denseRank2 as denseRank,
   domain,
   double,
   endsWith,
@@ -956,7 +844,7 @@ export {
   hasAnyKey,
   hasKey,
   id2 as id,
-  identity,
+  identity2 as identity,
   ilike,
   inList,
   inc,
@@ -964,7 +852,7 @@ export {
   inet,
   int4range,
   int8range,
-  integer,
+  integer2 as integer,
   interval2 as interval,
   exports_json_ns as json,
   jsonReplacer2 as jsonReplacer,
@@ -979,6 +867,9 @@ export {
   many2 as many,
   manyThrough2 as manyThrough,
   matches,
+  morph2 as morph,
+  morphMany2 as morphMany,
+  morphTo2 as morphTo,
   none,
   not,
   notIn,
@@ -989,9 +880,13 @@ export {
   overlaps,
   path,
   point,
+  rank2 as rank,
   real,
+  relevance,
+  rowNumber2 as rowNumber,
+  runningTotal2 as runningTotal,
   schema2 as schema,
-  smallint,
+  smallint2 as smallint,
   sql2 as sql,
   startsWith,
   t,
@@ -1004,5 +899,6 @@ export {
   tstzrange,
   tsvector,
   uuid2 as uuid,
-  varchar2 as varchar
+  varchar2 as varchar,
+  withOwner2 as withOwner
 };