rake-db 2.8.7 → 2.8.8

package/dist/index.mjs

@@ -1,5 +1,5 @@
 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 { getCallerFilePath, singleQuote, toSnakeCase, isRaw, toArray, snakeCaseKey, nameKey, emptyObject, deepCompare, raw, pathToLog, emptyArray, getImportPath, toCamelCase, codeToString, addCode, rawToCode, quoteObjectKey, backtickQuote } from 'orchid-core';
+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';
 import prompts from 'prompts';
@@ -505,7 +505,7 @@ const primaryKeyToSql = (primaryKey) => {
 
 const tableMethods = {
   enum(name) {
-    return new EnumColumn(this, name, []);
+    return new EnumColumn(name, []);
   }
 };
 
@@ -753,7 +753,7 @@ const mergeTableData = (a, b) => {
 };
 function add(item, options) {
   if (item instanceof ColumnType) {
-    return addOrDrop(this, "add", item, options);
+    return addOrDrop("add", item, options);
   } else if (item === emptyObject) {
     mergeTableData(changeTableData.add, getTableData());
     resetTableData();
@@ -772,7 +772,7 @@ function add(item, options) {
 }
 const drop = function(item, options) {
   if (item instanceof ColumnType) {
-    return addOrDrop(this, "drop", item, options);
+    return addOrDrop("drop", item, options);
   } else if (item === emptyObject) {
     mergeTableData(changeTableData.drop, getTableData());
     resetTableData();
@@ -789,9 +789,10 @@ const drop = function(item, options) {
     return result;
   }
 };
-const addOrDrop = (types, type, item, options) => {
-  if (types[nameKey]) {
-    item.data.name = types[nameKey];
+const addOrDrop = (type, item, options) => {
+  const name = consumeColumnName();
+  if (name) {
+    item.data.name = name;
   }
   if (item instanceof UnknownColumn) {
     const empty = columnTypeToColumnChange({
@@ -835,7 +836,13 @@ const columnTypeToColumnChange = (item) => {
   }
   return item.to;
 };
+const nameKey = Symbol("name");
 const tableChangeMethods = __spreadProps$2(__spreadValues$3({}, tableMethods), {
+  name(name) {
+    const types = Object.create(columnTypes.name.call(this, name));
+    types[nameKey] = name;
+    return types;
+  },
   add,
   drop,
   change(from, to, options) {
@@ -2496,22 +2503,22 @@ const getColumn = (ctx, data, domains, _a) => {
   } else {
     const domainColumn = domains[`${typeSchema}.${type}`];
     if (domainColumn) {
-      column = new DomainColumn({}, type).as(domainColumn);
+      column = new DomainColumn(type).as(domainColumn);
     } else {
       const enumType = data.enums.find(
         (item) => item.name === type && item.schemaName === typeSchema
       );
       if (enumType) {
-        column = new EnumColumn({}, type, enumType.values);
+        column = new EnumColumn(type, enumType.values);
       } else {
-        column = new CustomTypeColumn({}, type);
+        column = new CustomTypeColumn(type);
         ((_b2 = (_a2 = ctx.unsupportedTypes)[type]) != null ? _b2 : _a2[type] = []).push(
           `${schemaName}${tableName ? `.${tableName}` : ""}.${name}`
         );
       }
     }
   }
-  return isArray ? new ArrayColumn({}, column) : column;
+  return isArray ? new ArrayColumn(column) : column;
 };
 const getColumnType = (type, isSerial) => {
   if (!isSerial)
@@ -2751,9 +2758,10 @@ const makeColumnsShape = (ctx, data, domains, tableName, columns, primaryKey, in
     const camelCaseName = toCamelCase(item.name);
     if (ctx.snakeCase) {
       const snakeCaseName = toSnakeCase(camelCaseName);
-      column.data.name = snakeCaseName === item.name ? void 0 : item.name;
-    } else {
-      column.data.name = camelCaseName === item.name ? void 0 : item.name;
+      if (snakeCaseName !== item.name)
+        column.data.name = item.name;
+    } else if (camelCaseName !== item.name) {
+      column.data.name = item.name;
     }
     shape[camelCaseName] = column;
   }