orchid-orm 1.56.5 → 1.57.1

package/dist/migrations/postgres-js.mjs

@@ -1,5 +1,5 @@
 import { promptSelect, getSchemaAndTableFromName, getDbTableColumnsChecks, dbColumnToAst, instantiateDbColumn, concatSchemaAndName, encodeColumnDefault, getIndexName, getExcludeName, getConstraintName, tableToAst, getDbStructureTableData, makeDomainsMap, astToMigration, createMigrationInterface, introspectDbSchema, makeStructureToAstCtx, makeFileVersion, writeMigrationFile, migrateAndClose, migrate, structureToAst, saveMigratedVersion, rakeDbCommands } from 'rake-db';
-import { colors, toSnakeCase, deepCompare, emptyArray, toArray, exhaustive, toCamelCase, addCode, pluralize, codeToString, toPascalCase, getImportPath, singleQuote, quoteObjectKey, pathToLog } from 'orchid-core';
+import { colors, toSnakeCase, deepCompare, emptyArray, toArray, getFreeSetAlias, exhaustive, toCamelCase, addCode, pluralize, codeToString, toPascalCase, getImportPath, singleQuote, quoteObjectKey, pathToLog } from 'orchid-core';
 import { EnumColumn, ArrayColumn, getColumnBaseType, RawSQL, VirtualColumn, DomainColumn, UnknownColumn, defaultSchemaConfig, columnsShapeToCode, pushTableDataCode } from 'pqb';
 import path from 'node:path';
 import { pathToFileURL } from 'url';
@@ -1282,7 +1282,7 @@ const collectCodeComparableItemsType = (config, codeItems, key) => {
       ...codeItem.options,
       include: codeItem.options.include === void 0 ? void 0 : config.snakeCase ? toArray(codeItem.options.include).map(toSnakeCase) : toArray(codeItem.options.include),
       columns: codeItem.columns,
-      name: codeItem.name,
+      name: codeItem.options.name,
       columnKeys: codeItem.columnKeys,
       includeKeys: codeItem.includeKeys
     });
@@ -1414,8 +1414,7 @@ const handleItemChange = ({
       const column = changingColumns[dbColumn.column];
       if (column) {
         ((_a = column.from.data)[key] ?? (_a[key] = [])).push({
-          options: dbItem,
-          name,
+          options: { ...dbItem, name },
           with: key === "indexes" ? void 0 : dbColumn.with
         });
         return;
@@ -1423,8 +1422,7 @@ const handleItemChange = ({
     }
     ((_b = changeTableAst.drop)[key] ?? (_b[key] = [])).push({
       columns: dbColumns,
-      options: dbItem,
-      name
+      options: { ...dbItem, name }
     });
   } else if (rename) {
     delayedAst.push({
@@ -1781,14 +1779,7 @@ const collectCodeChecks = ({
     const baseName = `${codeTable.table}_${columnName}_check`;
     codeChecks.push(
       ...column.data.checks.map((check) => {
-        let name = check.name;
-        if (!name) {
-          name = baseName;
-          let n = 0;
-          while (names.has(name)) {
-            name = baseName + ++n;
-          }
-        }
+        const name = check.name || getFreeSetAlias(names, baseName, 1);
         names.add(name);
         return {
           check,
@@ -1803,14 +1794,7 @@ const collectCodeChecks = ({
       const { check } = constraint;
       if (check) {
         const baseName = `${codeTable.table}_check`;
-        let name = constraint.name;
-        if (!name) {
-          name = baseName;
-          let n = 0;
-          while (names.has(name)) {
-            name = baseName + ++n;
-          }
-        }
+        const name = constraint.name || getFreeSetAlias(names, baseName, 1);
         names.add(name);
         codeChecks.push({
           check: { sql: check, name: constraint.name },