pqb 0.10.14 → 0.10.16

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as orchid_core from 'orchid-core';
-import { EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, ColumnsShapeBase, StringKey, ColumnOutput, SimpleSpread, FilterTuple, NullableColumn, QueryInternal, QueryMetaBase, ColumnTypesBase, DbBase, ThenResult, ColumnShapeOutput, DefaultSelectColumns, SetOptional, Spread, CoalesceString, QueryBaseCommon, QueryCommon, ColumnDataBase, BaseOperators, PrimaryKeyColumn, HiddenColumn, ValidationContext, BaseNumberData, Code, numberTypeMethods, BaseStringData, DateColumnData, dateTypeMethods, JSONTypeAny, record, arrayMethods, name } from 'orchid-core';
+import { EmptyObject, RawExpression, ColumnTypeBase, MaybeArray, QueryResultRow, AdapterBase, QueryInput, ColumnsShapeBase, StringKey, ColumnOutput, SimpleSpread, FilterTuple, NullableColumn, QueryInternal, QueryMetaBase, ColumnTypesBase, DbBase, ThenResult, ColumnShapeOutput, DefaultSelectColumns, SetOptional, Spread, CoalesceString, QueryBaseCommon, QueryCommon, ColumnDataBase, BaseOperators, PrimaryKeyColumn, HiddenColumn, ValidationContext, MessageParam, BaseNumberData, Code, numberTypeMethods, BaseStringData, DateColumnData, dateTypeMethods, JSONTypeAny, record, ArrayMethodsData, arrayMethods, name } from 'orchid-core';
 import { PoolConfig, Pool, PoolClient } from 'pg';
 
 declare type BaseRelation = {
@@ -1989,7 +1989,7 @@ declare abstract class ColumnType<Type = unknown, Ops extends BaseOperators = Ba
         type: Transformed;
     };
     to<T extends ColumnType, ToType extends ColumnType>(this: T, fn: (input: T['type']) => ToType['type'] | undefined, type: ToType): ToType;
-    refine<T extends ColumnType, RefinedOutput extends T['type']>(this: T, check: (arg: T['type']) => unknown): T & {
+    refine<T extends ColumnType, RefinedOutput extends T['type']>(this: T, check: (arg: T['type']) => unknown, params?: MessageParam): T & {
         type: RefinedOutput;
     };
     superRefine<T extends ColumnType, RefinedOutput extends T['type']>(this: T, check: (arg: T['type'], ctx: ValidationContext) => unknown): T & {
@@ -2167,7 +2167,7 @@ declare const textMethods: {
         data: {
             email?: boolean | undefined;
         };
-    }>(this: T): Omit<T, "data"> & {
+    }>(this: T, params?: orchid_core.MessageParam | undefined): Omit<T, "data"> & {
         data: Omit<T["data"], "email"> & {
             email: boolean;
         };
@@ -2176,93 +2176,188 @@ declare const textMethods: {
         data: {
             url?: boolean | undefined;
         };
-    }>(this: T_1): Omit<T_1, "data"> & {
+    }>(this: T_1, params?: orchid_core.MessageParam | undefined): Omit<T_1, "data"> & {
         data: Omit<T_1["data"], "url"> & {
             url: boolean;
         };
     };
-    uuid<T_2 extends {
+    emoji<T_2 extends {
+        data: {
+            emoji?: boolean | undefined;
+        };
+    }>(this: T_2, params?: orchid_core.MessageParam | undefined): Omit<T_2, "data"> & {
+        data: Omit<T_2["data"], "emoji"> & {
+            emoji: boolean;
+        };
+    };
+    uuid<T_3 extends {
         data: {
             uuid?: boolean | undefined;
         };
-    }>(this: T_2): Omit<T_2, "data"> & {
-        data: Omit<T_2["data"], "uuid"> & {
+    }>(this: T_3, params?: orchid_core.MessageParam | undefined): Omit<T_3, "data"> & {
+        data: Omit<T_3["data"], "uuid"> & {
             uuid: boolean;
         };
     };
-    cuid<T_3 extends {
+    cuid<T_4 extends {
         data: {
             cuid?: boolean | undefined;
         };
-    }>(this: T_3): Omit<T_3, "data"> & {
-        data: Omit<T_3["data"], "cuid"> & {
+    }>(this: T_4, params?: orchid_core.MessageParam | undefined): Omit<T_4, "data"> & {
+        data: Omit<T_4["data"], "cuid"> & {
             cuid: boolean;
         };
     };
-    regex<T_4 extends {
+    cuid2<T_5 extends {
+        data: {
+            cuid2?: boolean | undefined;
+        };
+    }>(this: T_5, params?: orchid_core.MessageParam | undefined): Omit<T_5, "data"> & {
+        data: Omit<T_5["data"], "cuid2"> & {
+            cuid2: boolean;
+        };
+    };
+    ulid<T_6 extends {
+        data: {
+            ulid?: boolean | undefined;
+        };
+    }>(this: T_6, params?: orchid_core.MessageParam | undefined): Omit<T_6, "data"> & {
+        data: Omit<T_6["data"], "ulid"> & {
+            ulid: boolean;
+        };
+    };
+    regex<T_7 extends {
         data: {
             regex?: RegExp | undefined;
         };
-    }, Value extends RegExp>(this: T_4, value: Value): Omit<T_4, "data"> & {
-        data: Omit<T_4["data"], "regex"> & {
+    }, Value extends RegExp>(this: T_7, value: Value, params?: orchid_core.MessageParam | undefined): Omit<T_7, "data"> & {
+        data: Omit<T_7["data"], "regex"> & {
             regex: Value;
         };
     };
-    startsWith<T_5 extends {
+    includes<T_8 extends {
+        data: {
+            includes?: string | undefined;
+        };
+    }, Value_1 extends string>(this: T_8, value: Value_1, params?: orchid_core.MessageParam | undefined): Omit<T_8, "data"> & {
+        data: Omit<T_8["data"], "includes"> & {
+            includes: Value_1;
+        };
+    };
+    startsWith<T_9 extends {
         data: {
             startsWith?: string | undefined;
         };
-    }, Value_1 extends string>(this: T_5, value: Value_1): Omit<T_5, "data"> & {
-        data: Omit<T_5["data"], "startsWith"> & {
-            startsWith: Value_1;
+    }, Value_2 extends string>(this: T_9, value: Value_2, params?: orchid_core.MessageParam | undefined): Omit<T_9, "data"> & {
+        data: Omit<T_9["data"], "startsWith"> & {
+            startsWith: Value_2;
         };
     };
-    endsWith<T_6 extends {
+    endsWith<T_10 extends {
         data: {
             endsWith?: string | undefined;
         };
-    }, Value_2 extends string>(this: T_6, value: Value_2): Omit<T_6, "data"> & {
-        data: Omit<T_6["data"], "endsWith"> & {
-            endsWith: Value_2;
+    }, Value_3 extends string>(this: T_10, value: Value_3, params?: orchid_core.MessageParam | undefined): Omit<T_10, "data"> & {
+        data: Omit<T_10["data"], "endsWith"> & {
+            endsWith: Value_3;
         };
     };
-    trim<T_7 extends {
+    datetime<T_11 extends {
+        data: {
+            datetime?: {
+                offset?: boolean | undefined;
+                precision?: number | undefined;
+            } | undefined;
+        };
+    }>(this: T_11, params?: {
+        offset?: boolean | undefined;
+        precision?: number | undefined;
+    } & {
+        message?: string | undefined;
+    }): Omit<T_11, "data"> & {
+        data: Omit<T_11["data"], "datetime"> & {
+            datetime: {
+                offset?: boolean | undefined;
+                precision?: number | undefined;
+            } & {
+                message?: string | undefined;
+            };
+        };
+    };
+    ip<T_12 extends {
+        data: {
+            ip?: {
+                version?: "v4" | "v6" | undefined;
+            } | undefined;
+        };
+    }>(this: T_12, params?: {
+        version?: "v4" | "v6" | undefined;
+    } & {
+        message?: string | undefined;
+    }): Omit<T_12, "data"> & {
+        data: Omit<T_12["data"], "ip"> & {
+            ip: {
+                version?: "v4" | "v6" | undefined;
+            } & {
+                message?: string | undefined;
+            };
+        };
+    };
+    trim<T_13 extends {
         data: {
             trim?: boolean | undefined;
         };
-    }>(this: T_7): Omit<T_7, "data"> & {
-        data: Omit<T_7["data"], "trim"> & {
+    }>(this: T_13, params?: orchid_core.MessageParam | undefined): Omit<T_13, "data"> & {
+        data: Omit<T_13["data"], "trim"> & {
             trim: boolean;
         };
     };
-    min: <T_8 extends {
+    toLowerCase<T_14 extends {
+        data: {
+            toLowerCase?: boolean | undefined;
+        };
+    }>(this: T_14, params?: orchid_core.MessageParam | undefined): Omit<T_14, "data"> & {
+        data: Omit<T_14["data"], "toLowerCase"> & {
+            toLowerCase: boolean;
+        };
+    };
+    toUpperCase<T_15 extends {
+        data: {
+            toUpperCase?: boolean | undefined;
+        };
+    }>(this: T_15, params?: orchid_core.MessageParam | undefined): Omit<T_15, "data"> & {
+        data: Omit<T_15["data"], "toUpperCase"> & {
+            toUpperCase: boolean;
+        };
+    };
+    min: <T_16 extends {
         data: {
             min?: number | undefined;
         };
-    }, Value_3 extends number>(this: T_8, value: Value_3) => Omit<T_8, "data"> & {
-        data: Omit<T_8["data"], "min"> & {
-            min: Value_3;
+    }, Value_4 extends number>(this: T_16, value: Value_4, params?: orchid_core.MessageParam | undefined) => Omit<T_16, "data"> & {
+        data: Omit<T_16["data"], "min"> & {
+            min: Value_4;
         };
     };
-    max: <T_9 extends {
+    max: <T_17 extends {
         data: {
             max?: number | undefined;
         };
-    }, Value_4 extends number>(this: T_9, value: Value_4) => Omit<T_9, "data"> & {
-        data: Omit<T_9["data"], "max"> & {
-            max: Value_4;
+    }, Value_5 extends number>(this: T_17, value: Value_5, params?: orchid_core.MessageParam | undefined) => Omit<T_17, "data"> & {
+        data: Omit<T_17["data"], "max"> & {
+            max: Value_5;
         };
     };
-    length: <T_10 extends {
+    length: <T_18 extends {
         data: {
             length?: number | undefined;
         };
-    }, Value_5 extends number>(this: T_10, value: Value_5) => Omit<T_10, "data"> & {
-        data: Omit<T_10["data"], "length"> & {
-            length: Value_5;
+    }, Value_6 extends number>(this: T_18, value: Value_6, params?: orchid_core.MessageParam | undefined) => Omit<T_18, "data"> & {
+        data: Omit<T_18["data"], "length"> & {
+            length: Value_6;
         };
     };
-    nonEmpty: <T_11 extends orchid_core.NonEmptyBase>(this: T_11) => orchid_core.NonEmptyResult<T_11>;
+    nonEmpty: <T_19 extends orchid_core.NonEmptyBase>(this: T_19, params?: orchid_core.MessageParam | undefined) => orchid_core.NonEmptyResult<T_19>;
 };
 interface TextBaseColumn extends ColumnType<string, typeof Operators.text>, TextMethods {
 }
@@ -3159,7 +3254,7 @@ declare class EnumColumn<U extends string = string, T extends [U, ...U[]] = [U]>
     };
     dataType: string;
     constructor(types: ColumnTypesBase, enumName: string, options: T);
-    toCode(t: string): Code;
+    toCode(t: string, migration?: boolean): Code;
     toSQL(): string;
 }
 
@@ -3181,7 +3276,7 @@ declare const jsonTypes: {
     unknown: () => orchid_core.JSONUnknown;
     void: () => orchid_core.JSONVoid;
     array: <Type extends JSONTypeAny>(element: Type) => orchid_core.JSONArray<Type, "many">;
-    discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends orchid_core.Primitive, Types extends [orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => orchid_core.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types[number]>;
+    discriminatedUnion: <Discriminator extends string, DiscriminatorValue extends orchid_core.Primitive, Types extends [orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>, ...orchid_core.JSONDiscriminatedObject<Discriminator, DiscriminatorValue>[]]>(discriminator: Discriminator, options: Types) => orchid_core.JSONDiscriminatedUnion<Discriminator, DiscriminatorValue, Types>;
     enum: <U extends string, T_2 extends [U, ...U[]]>(options: T_2) => orchid_core.JSONEnum<U, T_2>;
     instanceOf: <T_3 extends new (...args: any[]) => any>(cls: T_3) => orchid_core.JSONInstanceOf<T_3>;
     intersection: <Left extends JSONTypeAny, Right extends JSONTypeAny>(left: Left, right: Right) => orchid_core.JSONIntersection<Left, Right>;
@@ -3267,12 +3362,8 @@ declare class JSONTextColumn extends ColumnType<string, typeof Operators.text> {
     toCode(t: string): Code;
 }
 
-declare type ArrayData<Item extends ColumnType> = ColumnData & {
+declare type ArrayData<Item extends ColumnTypeBase> = ColumnData & ArrayMethodsData & {
     item: Item;
-    min?: number;
-    max?: number;
-    length?: number;
-    isNonEmpty?: true;
 };
 declare type ArrayMethods = typeof arrayMethods;
 interface ArrayColumn<Item extends ColumnType> extends ColumnType<Item['type'][], typeof Operators.array>, ArrayMethods {
@@ -3286,11 +3377,11 @@ declare class ArrayColumn<Item extends ColumnType> extends ColumnType<Item['type
         not: ((key: string, value: any, values: unknown[]) => string) & {
             type: any;
         };
-        in: ((key: string, value: any[] | orchid_core.RawExpression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>> | Query, values: unknown[]) => string) & {
-            type: any[] | orchid_core.RawExpression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>> | Query;
+        in: ((key: string, value: any[] | orchid_core.RawExpression<ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>> | Query, values: unknown[]) => string) & {
+            type: any[] | orchid_core.RawExpression<ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>> | Query;
         };
-        notIn: ((key: string, value: any[] | orchid_core.RawExpression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>> | Query, values: unknown[]) => string) & {
-            type: any[] | orchid_core.RawExpression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>> | Query;
+        notIn: ((key: string, value: any[] | orchid_core.RawExpression<ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>> | Query, values: unknown[]) => string) & {
+            type: any[] | orchid_core.RawExpression<ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>> | Query;
         };
     };
     data: ArrayData<Item>;

package/dist/index.js

@@ -109,9 +109,16 @@ class ColumnType extends orchidCore.ColumnTypeBase {
     cloned.chain = [...this.chain, ["to", fn, type], ...cloned.chain];
     return cloned;
   }
-  refine(check) {
+  refine(check, params) {
     const cloned = Object.create(this);
-    cloned.chain = [...this.chain, ["refine", check]];
+    cloned.chain = [...this.chain, ["refine", check, cloned]];
+    if (typeof params === "string" || (params == null ? void 0 : params.message)) {
+      cloned.data = __spreadProps$7(__spreadValues$f({}, this.data), {
+        errors: __spreadProps$7(__spreadValues$f({}, this.data.errors), {
+          refine: typeof params === "string" ? params : params.message
+        })
+      });
+    }
     return cloned;
   }
   superRefine(check) {
@@ -367,7 +374,7 @@ const isDefaultTimeStamp = (item) => {
   if (item.dataType !== "timestamp")
     return false;
   const def = item.data.default;
-  return def && orchidCore.isRaw(def) && getRaw(def, []) === "now()";
+  return def && orchidCore.isRaw(def) && def.__raw === "now()";
 };
 const combineCodeElements = (input) => {
   if (typeof input === "string")
@@ -617,8 +624,6 @@ const columnCode = (type, t, code) => {
     orchidCore.addCode(code, ".hidden()");
   if (type.data.isNullable)
     orchidCore.addCode(code, ".nullable()");
-  if ("isNonEmpty" in type.data)
-    orchidCore.addCode(code, ".nonEmpty()");
   if (type.encodeFn)
     orchidCore.addCode(code, `.encode(${type.encodeFn.toString()})`);
   if (type.parseFn && !("hideFromCode" in type.parseFn))
@@ -641,6 +646,11 @@ const columnCode = (type, t, code) => {
   if (type.data.check) {
     orchidCore.addCode(code, columnCheckToCode(t, type.data.check));
   }
+  if (type.data.errors) {
+    for (const part of orchidCore.columnErrorMessagesToCode(type.data.errors)) {
+      orchidCore.addCode(code, part);
+    }
+  }
   const { validationDefault } = type.data;
   if (validationDefault) {
     orchidCore.addCode(
@@ -657,20 +667,6 @@ const columnCode = (type, t, code) => {
   return orchidCore.columnChainToCode(type.chain, t, code);
 };
 
-const numberDataToCode = (data) => {
-  let code = "";
-  if (data.gte !== void 0)
-    code += `.min(${data.gte})`;
-  if (data.gt !== void 0)
-    code += `.gt(${data.gt})`;
-  if (data.lte !== void 0)
-    code += `.max(${data.lte})`;
-  if (data.lt !== void 0)
-    code += `.lt(${data.lt})`;
-  if (data.multipleOf !== void 0)
-    code += `.step(${data.multipleOf})`;
-  return code;
-};
 class NumberBaseColumn extends ColumnType {
   constructor() {
     super(...arguments);
@@ -721,7 +717,7 @@ class SmallIntColumn extends IntegerBaseColumn {
     this.parseItem = parseInt;
   }
   toCode(t) {
-    return columnCode(this, t, `smallint()${numberDataToCode(this.data)}`);
+    return columnCode(this, t, `smallint()${orchidCore.numberDataToCode(this.data)}`);
   }
 }
 class IntegerColumn extends IntegerBaseColumn {
@@ -731,7 +727,7 @@ class IntegerColumn extends IntegerBaseColumn {
     this.parseItem = parseInt;
   }
   toCode(t) {
-    return columnCode(this, t, `integer()${numberDataToCode(this.data)}`);
+    return columnCode(this, t, `integer()${orchidCore.numberDataToCode(this.data)}`);
   }
 }
 class BigIntColumn extends NumberAsStringBaseColumn {
@@ -752,7 +748,7 @@ class RealColumn extends NumberBaseColumn {
     this.parseItem = parseFloat;
   }
   toCode(t) {
-    return columnCode(this, t, `real()${numberDataToCode(this.data)}`);
+    return columnCode(this, t, `real()${orchidCore.numberDataToCode(this.data)}`);
   }
 }
 class DoublePrecisionColumn extends NumberAsStringBaseColumn {
@@ -775,7 +771,7 @@ class SmallSerialColumn extends IntegerBaseColumn {
     return "smallserial";
   }
   toCode(t) {
-    return columnCode(this, t, `smallSerial()${numberDataToCode(this.data)}`);
+    return columnCode(this, t, `smallSerial()${orchidCore.numberDataToCode(this.data)}`);
   }
 }
 class SerialColumn extends IntegerBaseColumn {
@@ -789,7 +785,7 @@ class SerialColumn extends IntegerBaseColumn {
     return "serial";
   }
   toCode(t) {
-    return columnCode(this, t, `serial()${numberDataToCode(this.data)}`);
+    return columnCode(this, t, `serial()${orchidCore.numberDataToCode(this.data)}`);
   }
 }
 class BigSerialColumn extends NumberAsStringBaseColumn {
@@ -821,33 +817,6 @@ var __spreadValues$d = (a, b) => {
     }
   return a;
 };
-const stringDataToCode = (data) => {
-  let code = "";
-  const { min, isNonEmpty } = data;
-  if (min !== void 0 && (!isNonEmpty || isNonEmpty && min !== 1))
-    code += `.min(${min})`;
-  if (data.max !== void 0)
-    code += `.max(${data.max})`;
-  if (data.length !== void 0)
-    code += `.length(${data.length})`;
-  if (data.email !== void 0)
-    code += `.email()`;
-  if (data.url !== void 0)
-    code += `.url()`;
-  if (data.uuid !== void 0)
-    code += `.uuid()`;
-  if (data.cuid !== void 0)
-    code += `.cuid()`;
-  if (data.regex)
-    code += `.regex(${data.regex.toString()})`;
-  if (data.startsWith !== void 0)
-    code += `.startsWith(${orchidCore.singleQuote(data.startsWith)})`;
-  if (data.endsWith !== void 0)
-    code += `.endsWith(${orchidCore.singleQuote(data.endsWith)})`;
-  if (data.cuid !== void 0)
-    code += `.trim()`;
-  return code;
-};
 const textMethods = orchidCore.stringTypeMethods();
 class TextBaseColumn extends ColumnType {
   constructor() {
@@ -878,7 +847,7 @@ class VarCharColumn extends LimitedTextBaseColumn {
     return columnCode(
       this,
       t,
-      `varchar(${maxChars != null ? maxChars : ""})${stringDataToCode(this.data)}`
+      `varchar(${maxChars != null ? maxChars : ""})${orchidCore.stringDataToCode(this.data)}`
     );
   }
 }
@@ -892,7 +861,7 @@ class CharColumn extends LimitedTextBaseColumn {
     return columnCode(
       this,
       t,
-      `char(${maxChars != null ? maxChars : ""})${stringDataToCode(this.data)}`
+      `char(${maxChars != null ? maxChars : ""})${orchidCore.stringDataToCode(this.data)}`
     );
   }
 }
@@ -918,7 +887,7 @@ const textColumnToCode = (column, t) => {
   return columnCode(
     column,
     t,
-    `${column.dataType}(${args})${stringDataToCode(data)}`
+    `${column.dataType}(${args})${orchidCore.stringDataToCode(data)}`
   );
 };
 class TextColumn extends TextBaseColumn {
@@ -1170,21 +1139,13 @@ class DateBaseColumn extends ColumnType {
   }
 }
 assignMethodsToClass(DateBaseColumn, orchidCore.dateTypeMethods);
-const dateDataToCode = (data) => {
-  let code = "";
-  if (data.min)
-    code += `.min(new Date('${data.min.toISOString()}'))`;
-  if (data.max)
-    code += `.max(new Date('${data.max.toISOString()}'))`;
-  return code;
-};
 class DateColumn extends DateBaseColumn {
   constructor() {
     super(...arguments);
     this.dataType = "date";
   }
   toCode(t) {
-    return columnCode(this, t, `date()${dateDataToCode(this.data)}`);
+    return columnCode(this, t, `date()${orchidCore.dateDataToCode(this.data)}`);
   }
 }
 class DateTimeBaseClass extends DateBaseColumn {
@@ -1213,7 +1174,7 @@ const timestampToCode = (self, t) => {
   return columnCode(
     self,
     t,
-    `${self instanceof TimestampColumn ? "timestamp" : "timestampWithTimeZone"}(${p && p !== 6 ? p : ""})${dateDataToCode(self.data)}`
+    `${self instanceof TimestampColumn ? "timestamp" : "timestampWithTimeZone"}(${p && p !== 6 ? p : ""})${orchidCore.dateDataToCode(self.data)}`
   );
 };
 class TimestampColumn extends DateTimeBaseClass {
@@ -1245,7 +1206,7 @@ class TimeColumn extends DateTimeBaseClass {
     return columnCode(
       this,
       t,
-      `time(${dateTimePrecision || ""})${dateDataToCode(this.data)}`
+      `time(${dateTimePrecision || ""})${orchidCore.dateDataToCode(this.data)}`
     );
   }
 }
@@ -1260,7 +1221,7 @@ class TimeWithTimeZoneColumn extends DateTimeWithTimeZoneBaseClass {
     return columnCode(
       this,
       t,
-      `timeWithTimeZone(${dateTimePrecision || ""})${dateDataToCode(
+      `timeWithTimeZone(${dateTimePrecision || ""})${orchidCore.dateDataToCode(
         this.data
       )}`
     );
@@ -1311,12 +1272,9 @@ class EnumColumn extends ColumnType {
     this.operators = Operators.any;
     this.dataType = "enum";
   }
-  toCode(t) {
-    return columnCode(
-      this,
-      t,
-      `enum('${this.enumName}', [${this.options.map((option) => `'${option}'`).join(", ")}])`
-    );
+  toCode(t, migration) {
+    const options = migration ? "" : `, [${this.options.map((option) => `'${option}'`).join(", ")}]`;
+    return columnCode(this, t, `enum('${this.enumName}'${options})`);
   }
   toSQL() {
     const name = this.enumName;
@@ -1417,14 +1375,7 @@ class ArrayColumn extends ColumnType {
   toCode(t) {
     const code = ["array("];
     orchidCore.addCode(code, this.data.item.toCode(t));
-    orchidCore.addCode(code, ")");
-    const { min, max, length, isNonEmpty } = this.data;
-    if (min !== void 0 && (!isNonEmpty || isNonEmpty && min !== 1))
-      orchidCore.addCode(code, `.min(${min})`);
-    if (max !== void 0)
-      orchidCore.addCode(code, `.max(${max})`);
-    if (length !== void 0)
-      orchidCore.addCode(code, `.length(${length})`);
+    orchidCore.addCode(code, `)${orchidCore.arrayDataToCode(this.data)}`);
     return columnCode(this, t, code);
   }
 }