rake-db 2.4.1 → 2.4.2

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { quote, getRaw, EnumColumn, columnTypes, getColumnTypes, getTableData, ColumnType, resetTableData, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, columnsByType, instantiateColumn, codeToString, primaryKeyToCode, indexToCode, foreignKeyToCode, TimestampColumn, foreignKeyArgsToCode } from 'pqb';
-import { singleQuote, isRaw, toArray, emptyObject, addCode, quoteObjectKey } from 'orchid-core';
+import { singleQuote, isRaw, toArray, snakeCaseKey, nameKey, emptyObject, addCode, quoteObjectKey } from 'orchid-core';
 import path from 'path';
 import { readdir, mkdir, writeFile } from 'fs/promises';
 import prompts from 'prompts';
@@ -27,6 +27,7 @@ var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const migrationConfigDefaults = {
   migrationsPath: path.join("src", "db", "migrations"),
   migrationsTable: "schemaMigrations",
+  snakeCase: false,
   commands: {},
   import: (path2) => import(path2),
   log: true,
@@ -268,7 +269,7 @@ var __spreadValues$5 = (a, b) => {
 };
 var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const columnToSql = (key, item, values, hasMultiplePrimaryKeys) => {
-  const line = [`"${key}" ${item.toSQL()}`];
+  const line = [`"${item.data.name || key}" ${item.toSQL()}`];
   if (item.data.compression) {
     line.push(`COMPRESSION ${item.data.compression}`);
   }
@@ -481,6 +482,7 @@ var __objRest = (source, exclude) => {
 };
 const types = Object.assign(Object.create(columnTypes), tableMethods);
 const createTable$1 = async (migration, up, tableName, options, fn) => {
+  types[snakeCaseKey] = migration.options.snakeCase;
   const shape = getColumnTypes(types, fn);
   const tableData = getTableData();
   const ast = makeAst$1(
@@ -640,7 +642,14 @@ const mergeTableData = (a, b) => {
 };
 function add(item, options) {
   if (item instanceof ColumnType) {
-    return { type: "add", item, dropMode: options == null ? void 0 : options.dropMode };
+    if (this[nameKey]) {
+      item.data.name = this[nameKey];
+    }
+    return {
+      type: "add",
+      item,
+      dropMode: options == null ? void 0 : options.dropMode
+    };
   } else if (item === emptyObject) {
     mergeTableData(changeTableData.add, getTableData());
     resetTableData();
@@ -657,9 +666,16 @@ function add(item, options) {
     return result;
   }
 }
-const drop = (item, options) => {
+const drop = function(item, options) {
   if (item instanceof ColumnType) {
-    return { type: "drop", item, dropMode: options == null ? void 0 : options.dropMode };
+    if (this[nameKey]) {
+      item.data.name = this[nameKey];
+    }
+    return {
+      type: "drop",
+      item,
+      dropMode: options == null ? void 0 : options.dropMode
+    };
   } else if (item === emptyObject) {
     mergeTableData(changeTableData.drop, getTableData());
     resetTableData();
@@ -699,6 +715,7 @@ const tableChangeMethods = __spreadProps$2(__spreadValues$3({}, tableMethods), {
   change(from, to, options) {
     return __spreadValues$3({
       type: "change",
+      name: this[nameKey],
       from: columnTypeToColumnChange(from),
       to: columnTypeToColumnChange(to)
     }, options);
@@ -733,6 +750,7 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   resetChangeTableData();
   const tableChanger = Object.create(columnTypes);
   Object.assign(tableChanger, tableChangeMethods);
+  tableChanger[snakeCaseKey] = migration.options.snakeCase;
   const changeData = (fn == null ? void 0 : fn(tableChanger)) || {};
   const ast = makeAst(up, tableName, changeData, changeTableData, options);
   const queries = astToQueries(ast);
@@ -838,28 +856,28 @@ const astToQueries = (ast) => {
     } else if (item.type === "drop") {
       addColumnIndex(dropIndexes, key, item.item);
       alterTable.push(
-        `DROP COLUMN "${key}"${item.dropMode ? ` ${item.dropMode}` : ""}`
+        `DROP COLUMN "${item.item.data.name || key}"${item.dropMode ? ` ${item.dropMode}` : ""}`
       );
     } else if (item.type === "change") {
       const { from, to } = item;
       if (from.type !== to.type || from.collate !== to.collate) {
         alterTable.push(
-          `ALTER COLUMN "${key}" TYPE ${to.type}${to.collate ? ` COLLATE ${quote(to.collate)}` : ""}${item.using ? ` USING ${getRaw(item.using, values)}` : ""}`
+          `ALTER COLUMN "${item.name || key}" TYPE ${to.type}${to.collate ? ` COLLATE ${quote(to.collate)}` : ""}${item.using ? ` USING ${getRaw(item.using, values)}` : ""}`
         );
       }
       if (from.default !== to.default) {
         const value = typeof to.default === "object" && to.default && isRaw(to.default) ? getRaw(to.default, values) : quote(to.default);
         const expr = value === void 0 ? "DROP DEFAULT" : `SET DEFAULT ${value}`;
-        alterTable.push(`ALTER COLUMN "${key}" ${expr}`);
+        alterTable.push(`ALTER COLUMN "${item.name || key}" ${expr}`);
       }
       if (from.nullable !== to.nullable) {
         alterTable.push(
-          `ALTER COLUMN "${key}" ${to.nullable ? "DROP" : "SET"} NOT NULL`
+          `ALTER COLUMN "${item.name || key}" ${to.nullable ? "DROP" : "SET"} NOT NULL`
         );
       }
       if (from.compression !== to.compression) {
         alterTable.push(
-          `ALTER COLUMN "${key}" SET COMPRESSION ${to.compression || "DEFAULT"}`
+          `ALTER COLUMN "${item.name || key}" SET COMPRESSION ${to.compression || "DEFAULT"}`
         );
       }
       const foreignKeysLen = Math.max(
@@ -2019,6 +2037,7 @@ const pushTableAst = (ast, data, table, pendingTables, innerFKeys = data.foreign
         }
       );
     }
+    delete column.data.name;
     shape[item.name] = column;
   }
   ast.push({
@@ -2072,7 +2091,7 @@ const foreignKeyToAst = (fkey) => ({
   }
 });
 
-const astToMigration = (ast) => {
+const astToMigration = (config, ast) => {
   const first = [];
   const tables = [];
   const foreignKeys = [];
@@ -2088,7 +2107,7 @@ const astToMigration = (ast) => {
         first.push([]);
       first.push(...createEnum(item));
     } else if (item.type === "table" && item.action === "create") {
-      tables.push(createTable(item));
+      tables.push(createTable(config, item));
     } else if (item.type === "foreignKey") {
       if (foreignKeys.length)
         foreignKeys.push([]);
@@ -2154,13 +2173,16 @@ const createEnum = (ast) => {
   addCode(code, ");");
   return code;
 };
-const createTable = (ast) => {
+const createTable = (config, ast) => {
   const code = [];
   addCode(code, `await db.createTable(${quoteSchemaTable(ast)}, (t) => ({`);
-  const hasTimestamps = isTimestamp(ast.shape.createdAt) && isTimestamp(ast.shape.updatedAt);
+  const hasTimestamps = !config.snakeCase && isTimestamp(ast.shape.createdAt) && isTimestamp(ast.shape.updatedAt);
+  const hasTimestampsSnake = isTimestamp(ast.shape.created_at) && isTimestamp(ast.shape.updated_at);
   for (const key in ast.shape) {
     if (hasTimestamps && (key === "createdAt" || key === "updatedAt"))
       continue;
+    if (hasTimestampsSnake && (key === "created_at" || key === "updated_at"))
+      continue;
     const line = [`${quoteObjectKey(key)}: `];
     for (const part of ast.shape[key].toCode("t")) {
       addCode(line, part);
@@ -2168,9 +2190,12 @@ const createTable = (ast) => {
     addCode(line, ",");
     code.push(line);
   }
-  if (hasTimestamps) {
+  if (hasTimestamps || config.snakeCase && hasTimestampsSnake) {
     code.push(["...t.timestamps(),"]);
   }
+  if (hasTimestampsSnake && !config.snakeCase) {
+    code.push(["...t.timestampsSnakeCase(),"]);
+  }
   if (ast.primaryKey) {
     code.push([primaryKeyToCode(ast.primaryKey, "t")]);
   }
@@ -2208,7 +2233,7 @@ const pullDbStructure = async (options, config) => {
   const db = new DbStructure(adapter);
   const ast = await structureToAst(db);
   await adapter.close();
-  const result = astToMigration(ast);
+  const result = astToMigration(config, ast);
   if (!result)
     return;
   await writeMigrationFile(config, "pull", result);