pqb 0.25.1 → 0.26.0

package/dist/index.d.ts

@@ -264,7 +264,7 @@ type OnConflictItem = string | string[] | Expression;
 type OnConflictMergeUpdate = string | string[] | RecordUnknown | Expression;
 
 type BooleanQueryColumn = QueryColumn<boolean, OperatorsBoolean>;
-declare class BooleanColumn$1<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, boolean, Schema['boolean'], OperatorsBoolean> {
+declare class BooleanColumn$1<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, boolean, ReturnType<Schema['boolean']>, OperatorsBoolean> {
     dataType: "boolean";
     operators: OperatorsBoolean;
     constructor(schema: Schema);
@@ -2081,7 +2081,7 @@ declare class ScopeMethods {
 }
 
 type DateColumnInput = string | number | Date;
-declare abstract class DateBaseColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringNumberDate'], OperatorsDate, DateColumnInput, string, Schema['stringSchema']> {
+declare abstract class DateBaseColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringNumberDate']>, OperatorsDate, DateColumnInput, string, ReturnType<Schema['stringSchema']>> {
     data: DateColumnData;
     operators: OperatorsDate;
     encodeFn: (input: DateColumnInput) => string | Date;
@@ -2113,7 +2113,7 @@ declare class TimestampTZColumn<Schema extends ColumnSchemaConfig> extends DateT
     baseDataType: "timestamp";
     toCode(t: string): Code;
 }
-declare class TimeColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsTime> {
+declare class TimeColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsTime> {
     data: DateColumnData & {
         dateTimePrecision?: number;
     };
@@ -2122,7 +2122,7 @@ declare class TimeColumn<Schema extends ColumnSchemaConfig> extends ColumnType<S
     constructor(schema: Schema, dateTimePrecision?: number);
     toCode(t: string): Code;
 }
-declare class IntervalColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, TimeInterval, Schema['timeInterval'], OperatorsDate> {
+declare class IntervalColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, TimeInterval, ReturnType<Schema['timeInterval']>, OperatorsDate> {
     data: ColumnData & {
         fields?: string;
         precision?: number;
@@ -2165,7 +2165,7 @@ declare class JSONColumn<T, Schema extends ColumnTypeSchemaArg> extends ColumnTy
     operators: OperatorsJson;
     toCode(t: string): Code;
 }
-declare class JSONTextColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class JSONTextColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "json";
     operators: OperatorsText;
     constructor(schema: Schema);
@@ -2173,10 +2173,10 @@ declare class JSONTextColumn<Schema extends ColumnSchemaConfig> extends ColumnTy
 }
 
 type TextColumnData = StringTypeData;
-declare abstract class TextBaseColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare abstract class TextBaseColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     data: TextColumnData;
     operators: OperatorsText;
-    constructor(schema: Schema, schemaType?: Schema['stringSchema']);
+    constructor(schema: Schema, schemaType?: ReturnType<Schema['stringSchema']>);
 }
 declare abstract class LimitedTextBaseColumn<Schema extends ColumnSchemaConfig> extends TextBaseColumn<Schema> {
     data: TextColumnData & {
@@ -2206,55 +2206,55 @@ declare class TextColumn<Schema extends ColumnSchemaConfig> extends TextBaseColu
     constructor(schema: Schema, min?: number, max?: number);
     toCode(t: string): Code;
 }
-declare class ByteaColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, Buffer, Schema['buffer'], OperatorsText> {
+declare class ByteaColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, Buffer, ReturnType<Schema['buffer']>, OperatorsText> {
     dataType: "bytea";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class PointColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class PointColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "point";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class LineColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class LineColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "line";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class LsegColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class LsegColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "lseg";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class BoxColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class BoxColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "box";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class PathColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class PathColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "path";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class PolygonColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class PolygonColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "polygon";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class CircleColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class CircleColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "circle";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class MoneyColumn<Schema extends ColumnSchemaConfig> extends NumberBaseColumn<Schema, Schema['stringSchema']> {
+declare class MoneyColumn<Schema extends ColumnSchemaConfig> extends NumberBaseColumn<Schema, ReturnType<Schema['stringSchema']>> {
     dataType: "money";
     constructor(schema: Schema);
     toCode(t: string): Code;
@@ -2262,25 +2262,25 @@ declare class MoneyColumn<Schema extends ColumnSchemaConfig> extends NumberBaseC
         hideFromCode: boolean;
     };
 }
-declare class CidrColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class CidrColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "cidr";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class InetColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class InetColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "inet";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class MacAddrColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class MacAddrColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "macaddr";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class MacAddr8Column<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class MacAddr8Column<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "macaddr8";
     operators: OperatorsText;
     constructor(schema: Schema);
@@ -2307,7 +2307,7 @@ declare class BitVaryingColumn<Schema extends ColumnSchemaConfig> extends Column
     toSQL(): string;
 }
 type TsVectorGeneratedColumns = string[] | Record<string, SearchWeight>;
-declare class TsVectorColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class TsVectorColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     defaultLanguage: string;
     dataType: "tsvector";
     operators: OperatorsText;
@@ -2339,13 +2339,13 @@ declare class TsVectorColumn<Schema extends ColumnSchemaConfig> extends ColumnTy
      */
     generated<T extends PickColumnData>(this: T, ...args: StaticSQLArgs | [language: string, columns: TsVectorGeneratedColumns] | [columns: TsVectorGeneratedColumns]): T;
 }
-declare class TsQueryColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class TsQueryColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "tsquery";
     operators: OperatorsText;
     constructor(schema: Schema);
     toCode(t: string): Code;
 }
-declare class UUIDColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['uuid'], OperatorsText> {
+declare class UUIDColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['uuid']>, OperatorsText> {
     dataType: "uuid";
     operators: OperatorsText;
     constructor(schema: Schema);
@@ -2357,7 +2357,7 @@ declare class UUIDColumn<Schema extends ColumnSchemaConfig> extends ColumnType<S
     };
     toCode(t: string): Code;
 }
-declare class XMLColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsText> {
+declare class XMLColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsText> {
     dataType: "xml";
     operators: OperatorsText;
     constructor(schema: Schema);
@@ -2373,7 +2373,7 @@ declare class CitextColumn<Schema extends ColumnSchemaConfig> extends TextBaseCo
     toCode(t: string): Code;
 }
 
-declare class CustomTypeColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, unknown, Schema['unknown'], typeof Operators.any> {
+declare class CustomTypeColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, unknown, ReturnType<Schema['unknown']>, typeof Operators.any> {
     dataType: string;
     operators: OperatorsAny;
     constructor(schema: Schema, dataType: string);
@@ -2530,16 +2530,16 @@ declare abstract class NumberBaseColumn<Schema extends ColumnSchemaConfig, Schem
     data: NumberColumnData;
     operators: OperatorsNumber;
 }
-declare abstract class IntegerBaseColumn<Schema extends ColumnSchemaConfig> extends NumberBaseColumn<Schema, Schema['int']> {
+declare abstract class IntegerBaseColumn<Schema extends ColumnSchemaConfig> extends NumberBaseColumn<Schema, ReturnType<Schema['int']>> {
     data: NumberColumnData;
     constructor(schema: Schema);
 }
-declare abstract class NumberAsStringBaseColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsNumber> {
+declare abstract class NumberAsStringBaseColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsNumber> {
     operators: OperatorsNumber;
     data: ColumnData;
     constructor(schema: Schema);
 }
-declare class DecimalColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, Schema['stringSchema'], OperatorsNumber> {
+declare class DecimalColumn<Schema extends ColumnSchemaConfig> extends ColumnType<Schema, string, ReturnType<Schema['stringSchema']>, OperatorsNumber> {
     data: ColumnData & {
         numericPrecision?: number;
         numericScale?: number;
@@ -2568,7 +2568,7 @@ declare class BigIntColumn<Schema extends ColumnSchemaConfig> extends NumberAsSt
     toCode(t: string): Code;
     identity<T extends ColumnType>(this: T, options?: TableData.Identity): IdentityColumn<T>;
 }
-declare class RealColumn<Schema extends ColumnSchemaConfig> extends NumberBaseColumn<Schema, Schema['number']> {
+declare class RealColumn<Schema extends ColumnSchemaConfig> extends NumberBaseColumn<Schema, ReturnType<Schema['number']>> {
     dataType: "real";
     parseItem: typeof parseFloat;
     constructor(schema: Schema);
@@ -2840,7 +2840,7 @@ interface DbResult<ColumnTypes> extends Db<string, Record<string, never>, EmptyO
     close: Adapter['close'];
 }
 /**
- * For the case of using the query builder as a standalone tool, use `createDb` from `pqb` package.
+ * For the case of using the query builder as a standalone tool, use `createDb`.
  *
  * As `Orchid ORM` focuses on ORM usage, docs examples mostly demonstrates how to work with ORM-defined tables,
  * but everything that's not related to table relations should also work with `pqb` query builder on its own.
@@ -2850,6 +2850,10 @@ interface DbResult<ColumnTypes> extends Db<string, Record<string, never>, EmptyO
  * ```ts
  * import { createDb } from 'orchid-orm';
  *
+ * import { zodSchemaConfig } from 'orchid-orm-schema-to-zod';
+ * // or
+ * import { SchemaConfig } from 'orchid-orm-valibot';
+ *
  * const db = createDb({
  *   // db connection options
  *   databaseURL: process.env.DATABASE_URL,
@@ -2861,6 +2865,11 @@ interface DbResult<ColumnTypes> extends Db<string, Record<string, never>, EmptyO
  *   // override default SQL for timestamp, see `nowSQL` above
  *   nowSQL: `now() AT TIME ZONE 'UTC'`,
  *
+ *   // optional, but recommended: makes zod schemas for your tables
+ *   schemaConfig: zodSchemaConfig,
+ *   // or
+ *   schemaConfig: valibotSchemaConfig,
+ *
  *   // override column types:
  *   columnTypes: (t) => ({
  *     // by default timestamp is returned as a string, override to a number
@@ -6966,7 +6975,7 @@ interface ColumnsShapeToObjectArray<Shape extends QueryColumns> {
     operators: OperatorsAny;
 }
 
-declare abstract class VirtualColumn<Schema extends ColumnSchemaConfig, InputSchema extends Schema['type'] = Schema['never']> extends ColumnType<Schema, unknown, InputSchema, OperatorsAny> {
+declare abstract class VirtualColumn<Schema extends ColumnSchemaConfig, InputSchema extends Schema['type'] = ReturnType<Schema['never']>> extends ColumnType<Schema, unknown, InputSchema, OperatorsAny> {
     dataType: string;
     operators: OperatorsAny;
     constructor(schema: Schema, inputSchema?: InputSchema);

package/dist/index.js

@@ -831,7 +831,7 @@ class JSONColumn extends ColumnType {
 JSONColumn.prototype.encodeFn = JSON.stringify;
 class JSONTextColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "json";
     this.operators = Operators.text;
   }
@@ -1483,7 +1483,12 @@ const dateTimeEncode = (input) => {
 const skipDateMethodsFromToCode = { encodeFn: dateTimeEncode };
 class DateBaseColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringNumberDate);
+    super(
+      schema,
+      schema.stringNumberDate(),
+      schema.stringSchema(),
+      schema.stringNumberDate()
+    );
     this.operators = Operators.date;
     this.encodeFn = dateTimeEncode;
     this.asNumber = schema.dateAsNumber;
@@ -1557,7 +1562,7 @@ class TimestampTZColumn extends DateTimeTzBaseClass {
 }
 class TimeColumn extends ColumnType {
   constructor(schema, dateTimePrecision) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "time";
     this.operators = Operators.time;
     this.data.dateTimePrecision = dateTimePrecision;
@@ -1575,7 +1580,7 @@ class TimeColumn extends ColumnType {
 }
 class IntervalColumn extends ColumnType {
   constructor(schema, fields, precision) {
-    super(schema, schema.timeInterval);
+    super(schema, schema.timeInterval());
     this.dataType = "interval";
     this.operators = Operators.date;
     this.data.fields = fields;
@@ -1748,10 +1753,20 @@ const defaultSchemaConfig = {
   array(item) {
     return new ArrayColumn(defaultSchemaConfig, item, void 0);
   },
+  boolean: orchidCore.noop,
+  buffer: orchidCore.noop,
+  unknown: orchidCore.noop,
+  never: orchidCore.noop,
+  stringSchema: orchidCore.noop,
   stringMin: orchidCore.noop,
   stringMax: orchidCore.noop,
   stringMinMax: orchidCore.noop,
+  number: orchidCore.noop,
+  int: orchidCore.noop,
+  stringNumberDate: orchidCore.noop,
+  timeInterval: orchidCore.noop,
   bit: orchidCore.noop,
+  uuid: orchidCore.noop,
   nullable() {
     return orchidCore.setColumnData(this, "isNullable", true);
   },
@@ -3526,19 +3541,19 @@ class NumberBaseColumn extends ColumnType {
 }
 class IntegerBaseColumn extends NumberBaseColumn {
   constructor(schema) {
-    super(schema, schema.int);
+    super(schema, schema.int());
     this.data.int = true;
   }
 }
 class NumberAsStringBaseColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.operators = Operators.number;
   }
 }
 class DecimalColumn extends ColumnType {
   constructor(schema, numericPrecision, numericScale) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.operators = Operators.number;
     this.dataType = "decimal";
     this.data.numericPrecision = numericPrecision;
@@ -3611,7 +3626,7 @@ class BigIntColumn extends NumberAsStringBaseColumn {
 }
 class RealColumn extends NumberBaseColumn {
   constructor(schema) {
-    super(schema, schema.number);
+    super(schema, schema.number());
     this.dataType = "real";
     this.parseItem = parseFloat;
   }
@@ -3697,14 +3712,17 @@ var __spreadValues$9 = (a, b) => {
 };
 var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 class TextBaseColumn extends ColumnType {
-  constructor(schema, schemaType = schema.stringSchema) {
+  constructor(schema, schemaType = schema.stringSchema()) {
     super(schema, schemaType);
     this.operators = Operators.text;
   }
 }
 class LimitedTextBaseColumn extends TextBaseColumn {
   constructor(schema, limit) {
-    super(schema, limit ? schema.stringMax(limit) : schema.stringSchema);
+    super(
+      schema,
+      limit ? schema.stringMax(limit) : schema.stringSchema()
+    );
     this.data.maxChars = limit;
   }
   toSQL() {
@@ -3787,7 +3805,7 @@ const textColumnToCode = (column, t) => {
     `${column.dataType}(${args})${orchidCore.stringDataToCode(data)}`
   );
 };
-const minMaxToSchema = (schema, min, max) => min ? max ? schema.stringMinMax(min, max) : schema.stringMin(min) : schema.stringSchema;
+const minMaxToSchema = (schema, min, max) => min ? max ? schema.stringMinMax(min, max) : schema.stringMin(min) : schema.stringSchema();
 class TextColumn extends TextBaseColumn {
   constructor(schema, min, max) {
     super(schema, minMaxToSchema(schema, min, max));
@@ -3800,7 +3818,7 @@ class TextColumn extends TextBaseColumn {
 }
 class ByteaColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.buffer);
+    super(schema, schema.buffer());
     this.dataType = "bytea";
     this.operators = Operators.text;
   }
@@ -3810,7 +3828,7 @@ class ByteaColumn extends ColumnType {
 }
 class PointColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "point";
     this.operators = Operators.text;
   }
@@ -3820,7 +3838,7 @@ class PointColumn extends ColumnType {
 }
 class LineColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "line";
     this.operators = Operators.text;
   }
@@ -3830,7 +3848,7 @@ class LineColumn extends ColumnType {
 }
 class LsegColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "lseg";
     this.operators = Operators.text;
   }
@@ -3840,7 +3858,7 @@ class LsegColumn extends ColumnType {
 }
 class BoxColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "box";
     this.operators = Operators.text;
   }
@@ -3850,7 +3868,7 @@ class BoxColumn extends ColumnType {
 }
 class PathColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "path";
     this.operators = Operators.text;
   }
@@ -3860,7 +3878,7 @@ class PathColumn extends ColumnType {
 }
 class PolygonColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "polygon";
     this.operators = Operators.text;
   }
@@ -3870,7 +3888,7 @@ class PolygonColumn extends ColumnType {
 }
 class CircleColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "circle";
     this.operators = Operators.text;
   }
@@ -3880,7 +3898,7 @@ class CircleColumn extends ColumnType {
 }
 class MoneyColumn extends NumberBaseColumn {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "money";
     this.parseFn = Object.assign(
       function(input) {
@@ -3897,7 +3915,7 @@ class MoneyColumn extends NumberBaseColumn {
 }
 class CidrColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "cidr";
     this.operators = Operators.text;
   }
@@ -3907,7 +3925,7 @@ class CidrColumn extends ColumnType {
 }
 class InetColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "inet";
     this.operators = Operators.text;
   }
@@ -3917,7 +3935,7 @@ class InetColumn extends ColumnType {
 }
 class MacAddrColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "macaddr";
     this.operators = Operators.text;
   }
@@ -3927,7 +3945,7 @@ class MacAddrColumn extends ColumnType {
 }
 class MacAddr8Column extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "macaddr8";
     this.operators = Operators.text;
   }
@@ -3973,7 +3991,7 @@ class BitVaryingColumn extends ColumnType {
 }
 class TsVectorColumn extends ColumnType {
   constructor(schema, defaultLanguage = orchidCore.getDefaultLanguage()) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.defaultLanguage = defaultLanguage;
     this.dataType = "tsvector";
     this.operators = Operators.text;
@@ -4027,7 +4045,7 @@ class TsVectorColumn extends ColumnType {
 }
 class TsQueryColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "tsquery";
     this.operators = Operators.text;
   }
@@ -4039,7 +4057,7 @@ const uuidDefaultSQL = "gen_random_uuid()";
 const uuidDefault = new RawSQL(uuidDefaultSQL);
 class UUIDColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.uuid);
+    super(schema, schema.uuid());
     this.dataType = "uuid";
     this.operators = Operators.text;
   }
@@ -4062,7 +4080,7 @@ class UUIDColumn extends ColumnType {
 }
 class XMLColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.stringSchema);
+    super(schema, schema.stringSchema());
     this.dataType = "xml";
     this.operators = Operators.text;
   }
@@ -4083,7 +4101,7 @@ class CitextColumn extends TextBaseColumn {
 
 class BooleanColumn extends ColumnType {
   constructor(schema) {
-    super(schema, schema.boolean);
+    super(schema, schema.boolean());
     this.dataType = "boolean";
     this.operators = Operators.boolean;
     this.parseItem = (input) => input[0] === "t";
@@ -4095,7 +4113,12 @@ class BooleanColumn extends ColumnType {
 
 class CustomTypeColumn extends ColumnType {
   constructor(schema, dataType) {
-    super(schema, schema.unknown, schema.unknown, schema.unknown);
+    super(
+      schema,
+      schema.unknown(),
+      schema.unknown(),
+      schema.unknown()
+    );
     this.dataType = dataType;
     this.operators = Operators.any;
     this.data.isOfCustomType = true;
@@ -4344,7 +4367,7 @@ const makeColumnTypes = (schema) => {
 RawSQL.prototype.columnTypes = makeColumnTypes;
 
 class VirtualColumn extends ColumnType {
-  constructor(schema, inputSchema = schema.never) {
+  constructor(schema, inputSchema = schema.never()) {
     super(schema, inputSchema);
     this.dataType = "";
     this.operators = Operators.any;
@@ -4356,7 +4379,7 @@ class VirtualColumn extends ColumnType {
 
 class UnknownColumn extends VirtualColumn {
   constructor(schema) {
-    super(schema, schema.unknown);
+    super(schema, schema.unknown());
   }
 }
 RawSQL.prototype._type = new UnknownColumn(defaultSchemaConfig);