rake-db 2.8.9 → 2.8.10

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { columnTypes, quote, getRaw, EnumColumn, getColumnTypes, getTableData, ColumnType, resetTableData, UnknownColumn, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, simplifyColumnDefault, columnsByType, instantiateColumn, DomainColumn, CustomTypeColumn, ArrayColumn, getConstraintKind, primaryKeyToCode, indexToCode, constraintToCode, TimestampTzColumn, referencesArgsToCode, constraintPropsToCode } from 'pqb';
+import { columnTypes, quote, getRaw, EnumColumn, getColumnTypes, getTableData, ColumnType, resetTableData, UnknownColumn, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, simplifyColumnDefault, columnsByType, instantiateColumn, DomainColumn, CustomTypeColumn, ArrayColumn, getConstraintKind, primaryKeyToCode, indexToCode, constraintToCode, referencesArgsToCode, constraintPropsToCode, TimestampTZColumn } from 'pqb';
 import { getCallerFilePath, singleQuote, toSnakeCase, isRaw, toArray, snakeCaseKey, emptyObject, consumeColumnName, deepCompare, raw, pathToLog, emptyArray, getImportPath, toCamelCase, codeToString, addCode, rawToCode, quoteObjectKey, backtickQuote } from 'orchid-core';
 import path from 'path';
 import { readdir, mkdir, writeFile } from 'fs/promises';
@@ -2871,17 +2871,14 @@ const createDomain = (ast) => {
   return code;
 };
 const createTable = (config, ast) => {
-  var _a, _b, _c, _d, _e, _f;
   const code = [];
   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, TimestampTZColumn);
+  const timestampsNoTZ = getTimestampsInfo(config, ast, 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 = [`${quoteObjectKey(key)}: `];
     for (const part of ast.shape[key].toCode("t", true)) {
@@ -2890,9 +2887,10 @@ const createTable = (config, ast) => {
     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) {
@@ -2911,11 +2909,25 @@ const createTable = (config, ast) => {
   addCode(code, "}));");
   return code;
 };
-const isTimestamp = (column) => {
+const isTimestamp = (column, type) => {
   if (!column)
     return false;
   const { default: def } = column.data;
-  return column instanceof TimestampTzColumn && !column.data.isNullable && def && typeof def === "object" && isRaw(def) && def.__raw === "now()";
+  return column instanceof type && !column.data.isNullable && def && typeof def === "object" && 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 = getConstraintKind(item);