rake-db 2.8.8 → 2.8.10

package/dist/index.d.ts

@@ -328,24 +328,50 @@ declare const rollback: <CT extends Record<string, orchid_core.AnyColumnTypeCrea
 declare const redo: <CT extends Record<string, orchid_core.AnyColumnTypeCreator>>(options: MaybeArray<AdapterOptions>, config: RakeDbConfig<CT>, args?: string[]) => Promise<void>;
 
 declare const rakeDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreator> = {
-    timestamps: <T extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
+    timestamps<T extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
         name(name: string): {
             timestamp(): T;
         };
         timestamp(): T;
-    }) => {
+        timestampsSnakeCase(): {
+            createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
+            updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
+        };
+    }): {
         createdAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
         updatedAt: orchid_core.ColumnWithDefault<T, orchid_core.RawExpression>;
     };
-    timestampsSnakeCase: <T_1 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
+    timestampsSnakeCase<T_1 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
         name(name: string): {
             timestamp(): T_1;
         };
         timestamp(): T_1;
-    }) => {
+    }): {
         createdAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
         updatedAt: orchid_core.ColumnWithDefault<T_1, orchid_core.RawExpression>;
     };
+    timestampsNoTZ<T_2 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
+        name(name: string): {
+            timestampNoTZ(): T_2;
+        };
+        timestampNoTZ(): T_2;
+        timestampsNoTZSnakeCase(): {
+            createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
+            updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
+        };
+    }): {
+        createdAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
+        updatedAt: orchid_core.ColumnWithDefault<T_2, orchid_core.RawExpression>;
+    };
+    timestampsNoTZSnakeCase<T_3 extends orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>(this: {
+        name(name: string): {
+            timestampNoTZ(): T_3;
+        };
+        timestampNoTZ(): T_3;
+    }): {
+        createdAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
+        updatedAt: orchid_core.ColumnWithDefault<T_3, orchid_core.RawExpression>;
+    };
     name: typeof orchid_core.name;
     raw: (sql: string, values?: false | Record<string, unknown> | undefined) => orchid_core.RawExpression<orchid_core.ColumnTypeBase<unknown, orchid_core.BaseOperators, unknown, orchid_core.ColumnDataBase>>;
     smallint(): pqb.SmallIntColumn;
@@ -367,12 +393,12 @@ declare const rakeDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreato
     citext(min: number, max: number): pqb.CitextColumn;
     bytea(): pqb.ByteaColumn;
     date(): pqb.DateColumn;
-    timestampWithoutTimeZone<Precision_2 extends number>(precision?: Precision_2 | undefined): pqb.TimestampColumn<Precision_2>;
-    timestamp<Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined): pqb.TimestampTzColumn<number>;
+    timestampNoTZ<Precision_2 extends number>(precision?: Precision_2 | undefined): pqb.TimestampColumn<Precision_2>;
+    timestamp<Precision_3 extends number | undefined = undefined>(precision?: Precision_3 | undefined): pqb.TimestampTZColumn<number>;
     time<Precision_4 extends number | undefined = undefined>(precision?: Precision_4 | undefined): pqb.TimeColumn<Precision_4>;
     interval<Fields extends string | undefined = undefined, Precision_5 extends number | undefined = undefined>(fields?: Fields | undefined, precision?: Precision_5 | undefined): pqb.IntervalColumn<Fields, Precision_5>;
     boolean(): pqb.BooleanColumn;
-    enum<U extends string, T_2 extends [U, ...U[]]>(dataType: string, type: T_2): pqb.EnumColumn<U, T_2>;
+    enum<U extends string, T_4 extends [U, ...U[]]>(dataType: string, type: T_4): pqb.EnumColumn<U, T_4>;
     point(): pqb.PointColumn;
     line(): pqb.LineColumn;
     lseg(): pqb.LsegColumn;
@@ -392,8 +418,8 @@ declare const rakeDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreato
     xml(): pqb.XMLColumn;
     json<Type extends orchid_core.JSONTypeAny>(schemaOrFn: Type | ((j: {
         set: <Value extends orchid_core.JSONTypeAny>(valueType: Value) => orchid_core.JSONSet<Value>;
-        tuple: <T_3 extends [] | orchid_core.JSONTupleItems, Rest extends orchid_core.JSONTypeAny | null = null>(items: T_3, rest?: Rest) => orchid_core.JSONTuple<T_3, Rest>;
-        union: <T_4 extends [orchid_core.JSONTypeAny, orchid_core.JSONTypeAny, ...orchid_core.JSONTypeAny[]]>(types: T_4) => orchid_core.JSONUnion<T_4>;
+        tuple: <T_5 extends [] | orchid_core.JSONTupleItems, Rest extends orchid_core.JSONTypeAny | null = null>(items: T_5, rest?: Rest) => orchid_core.JSONTuple<T_5, Rest>;
+        union: <T_6 extends [orchid_core.JSONTypeAny, orchid_core.JSONTypeAny, ...orchid_core.JSONTypeAny[]]>(types: T_6) => orchid_core.JSONUnion<T_6>;
         any: () => orchid_core.JSONAny;
         bigint: () => orchid_core.JSONBigInt;
         boolean: () => orchid_core.JSONBoolean;
@@ -406,21 +432,21 @@ declare const rakeDb: <CT extends Record<string, orchid_core.AnyColumnTypeCreato
         unknown: () => orchid_core.JSONUnknown;
         array: <Type_1 extends orchid_core.JSONTypeAny>(element: Type_1) => orchid_core.JSONArray<Type_1, "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>;
-        enum: <U_1 extends string, T_5 extends [U_1, ...U_1[]]>(options: T_5) => orchid_core.JSONEnum<U_1, T_5>;
-        instanceOf: <T_6 extends new (...args: any[]) => any>(cls: T_6) => orchid_core.JSONInstanceOf<T_6>;
+        enum: <U_1 extends string, T_7 extends [U_1, ...U_1[]]>(options: T_7) => orchid_core.JSONEnum<U_1, T_7>;
+        instanceOf: <T_8 extends new (...args: any[]) => any>(cls: T_8) => orchid_core.JSONInstanceOf<T_8>;
         intersection: <Left extends orchid_core.JSONTypeAny, Right extends orchid_core.JSONTypeAny>(left: Left, right: Right) => orchid_core.JSONIntersection<Left, Right>;
-        lazy: <T_7 extends orchid_core.JSONTypeAny>(fn: () => T_7) => orchid_core.JSONLazy<T_7>;
-        literal: <T_8 extends orchid_core.Primitive>(value: T_8) => orchid_core.JSONLiteral<T_8>;
+        lazy: <T_9 extends orchid_core.JSONTypeAny>(fn: () => T_9) => orchid_core.JSONLazy<T_9>;
+        literal: <T_10 extends orchid_core.Primitive>(value: T_10) => orchid_core.JSONLiteral<T_10>;
         map: <Key extends orchid_core.JSONTypeAny, Value_1 extends orchid_core.JSONTypeAny>(keyType: Key, valueType: Value_1) => orchid_core.JSONMap<Key, Value_1>;
-        nativeEnum: <T_9 extends orchid_core.EnumLike>(givenEnum: T_9) => orchid_core.JSONNativeEnum<T_9>;
-        nullable: <T_10 extends orchid_core.JSONTypeAny>(type: T_10) => orchid_core.JSONNullable<T_10>;
-        nullish: <T_11 extends orchid_core.JSONTypeAny>(type: T_11) => orchid_core.JSONNullish<T_11>;
-        object: <T_12 extends orchid_core.JSONObjectShape, UnknownKeys extends orchid_core.UnknownKeysParam = "strip", Catchall extends orchid_core.JSONTypeAny = orchid_core.JSONTypeAny>(shape: T_12) => orchid_core.JSONObject<T_12, UnknownKeys, Catchall, orchid_core.JSONTypeAny extends Catchall ? orchid_core.addQuestionMarks<{ [k_1 in keyof T_12]: T_12[k_1]["type"]; }> extends infer T_13 extends object ? { [k in keyof T_13]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_12]: T_12[k_1]["type"]; }>[k]; } : never : (orchid_core.addQuestionMarks<{ [k_1 in keyof T_12]: T_12[k_1]["type"]; }> extends infer T_16 extends object ? { [k in keyof T_16]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_12]: T_12[k_1]["type"]; }>[k]; } : never) & {
+        nativeEnum: <T_11 extends orchid_core.EnumLike>(givenEnum: T_11) => orchid_core.JSONNativeEnum<T_11>;
+        nullable: <T_12 extends orchid_core.JSONTypeAny>(type: T_12) => orchid_core.JSONNullable<T_12>;
+        nullish: <T_13 extends orchid_core.JSONTypeAny>(type: T_13) => orchid_core.JSONNullish<T_13>;
+        object: <T_14 extends orchid_core.JSONObjectShape, UnknownKeys extends orchid_core.UnknownKeysParam = "strip", Catchall extends orchid_core.JSONTypeAny = orchid_core.JSONTypeAny>(shape: T_14) => orchid_core.JSONObject<T_14, UnknownKeys, Catchall, orchid_core.JSONTypeAny extends Catchall ? orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }> extends infer T_15 extends object ? { [k in keyof T_15]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }>[k]; } : never : (orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }> extends infer T_18 extends object ? { [k in keyof T_18]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }>[k]; } : never) & {
             [k: string]: Catchall["type"];
-        } extends infer T_14 extends object ? { [k_2 in keyof T_14]: ((orchid_core.addQuestionMarks<{ [k_1 in keyof T_12]: T_12[k_1]["type"]; }> extends infer T_15 extends object ? { [k in keyof T_15]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_12]: T_12[k_1]["type"]; }>[k]; } : never) & {
+        } extends infer T_16 extends object ? { [k_2 in keyof T_16]: ((orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }> extends infer T_17 extends object ? { [k in keyof T_17]: orchid_core.addQuestionMarks<{ [k_1 in keyof T_14]: T_14[k_1]["type"]; }>[k]; } : never) & {
             [k: string]: Catchall["type"];
         })[k_2]; } : never>;
-        optional: <T_17 extends orchid_core.JSONTypeAny>(type: T_17) => orchid_core.JSONOptional<T_17>;
+        optional: <T_19 extends orchid_core.JSONTypeAny>(type: T_19) => orchid_core.JSONOptional<T_19>;
         record: typeof orchid_core.record;
     }) => Type)): pqb.JSONColumn<Type>;
     jsonText(): pqb.JSONTextColumn;

package/dist/index.js

@@ -2892,17 +2892,14 @@ const createDomain = (ast) => {
   return code;
 };
 const createTable = (config, ast) => {
-  var _a, _b, _c, _d, _e, _f;
   const code = [];
   orchidCore.addCode(code, `await db.createTable(${quoteSchemaTable(ast)}, (t) => ({`);
-  let hasTimestamps = isTimestamp(ast.shape.createdAt) && isTimestamp(ast.shape.updatedAt);
-  const camelCaseTimestamps = !config.snakeCase && hasTimestamps && !((_a = ast.shape.createdAt) == null ? void 0 : _a.data.name) && !((_b = ast.shape.updatedAt) == null ? void 0 : _b.data.name);
-  const snakeCaseTimestamps = hasTimestamps && !camelCaseTimestamps && (!config.snakeCase && ((_c = ast.shape.createdAt) == null ? void 0 : _c.data.name) === "created_at" && ((_d = ast.shape.updatedAt) == null ? void 0 : _d.data.name) === "updated_at" || config.snakeCase && !((_e = ast.shape.createdAt) == null ? void 0 : _e.data.name) && !((_f = ast.shape.updatedAt) == null ? void 0 : _f.data.name));
-  if (!camelCaseTimestamps && !snakeCaseTimestamps) {
-    hasTimestamps = false;
-  }
+  const timestamps = getTimestampsInfo(config, ast, pqb.TimestampTZColumn);
+  const timestampsNoTZ = getTimestampsInfo(config, ast, pqb.TimestampTZColumn);
+  const hasAnyTimestamps = timestamps.hasTimestamps || timestampsNoTZ.hasTimestamps;
+  const hasAnyCamelCaseTimestamps = timestamps.camelCaseTimestamps || timestampsNoTZ.camelCaseTimestamps;
   for (const key in ast.shape) {
-    if (hasTimestamps && (key === "createdAt" || key === "updatedAt"))
+    if (hasAnyTimestamps && (key === "createdAt" || key === "updatedAt"))
       continue;
     const line = [`${orchidCore.quoteObjectKey(key)}: `];
     for (const part of ast.shape[key].toCode("t", true)) {
@@ -2911,9 +2908,10 @@ const createTable = (config, ast) => {
     orchidCore.addCode(line, ",");
     code.push(line);
   }
-  if (hasTimestamps) {
+  if (hasAnyTimestamps) {
+    const key = timestamps.hasTimestamps ? "timestamps" : "timestampsNoTZ";
     code.push([
-      `...t.${camelCaseTimestamps || config.snakeCase ? "timestamps" : "timestampsSnakeCase"}(),`
+      `...t.${hasAnyCamelCaseTimestamps || config.snakeCase ? key : `${key}SnakeCase`}(),`
     ]);
   }
   if (ast.primaryKey) {
@@ -2932,11 +2930,25 @@ const createTable = (config, ast) => {
   orchidCore.addCode(code, "}));");
   return code;
 };
-const isTimestamp = (column) => {
+const isTimestamp = (column, type) => {
   if (!column)
     return false;
   const { default: def } = column.data;
-  return column instanceof pqb.TimestampTzColumn && !column.data.isNullable && def && typeof def === "object" && orchidCore.isRaw(def) && def.__raw === "now()";
+  return column instanceof type && !column.data.isNullable && def && typeof def === "object" && orchidCore.isRaw(def) && def.__raw === "now()";
+};
+const getTimestampsInfo = (config, ast, type) => {
+  var _a, _b, _c, _d, _e, _f;
+  let hasTimestamps = isTimestamp(ast.shape.createdAt, type) && isTimestamp(ast.shape.updatedAt, type);
+  const camelCaseTimestamps = !config.snakeCase && hasTimestamps && !((_a = ast.shape.createdAt) == null ? void 0 : _a.data.name) && !((_b = ast.shape.updatedAt) == null ? void 0 : _b.data.name);
+  const snakeCaseTimestamps = hasTimestamps && !camelCaseTimestamps && (!config.snakeCase && ((_c = ast.shape.createdAt) == null ? void 0 : _c.data.name) === "created_at" && ((_d = ast.shape.updatedAt) == null ? void 0 : _d.data.name) === "updated_at" || config.snakeCase && !((_e = ast.shape.createdAt) == null ? void 0 : _e.data.name) && !((_f = ast.shape.updatedAt) == null ? void 0 : _f.data.name));
+  if (!camelCaseTimestamps && !snakeCaseTimestamps) {
+    hasTimestamps = false;
+  }
+  return {
+    hasTimestamps,
+    camelCaseTimestamps,
+    snakeCaseTimestamps
+  };
 };
 const createConstraint = (item) => {
   const kind = pqb.getConstraintKind(item);