rake-db 2.27.26 → 2.27.28

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { isRawSQL, escapeForMigration, ArrayColumn, toSnakeCase, toCamelCase, DomainColumn, toArray, EnumColumn, defaultSchemaConfig, snakeCaseKey, getColumnTypes, parseTableData, emptyObject, escapeString, tableDataMethods, setCurrentColumnName, consumeColumnName, Column, parseTableDataInput, UnknownColumn, setDefaultLanguage, deepCompare, raw, singleQuote, logParamToLogObject, createDbWithAdapter, getImportPath, pathToLog, emptyArray, makeColumnTypes, getStackTrace, colors, makeColumnsByType, RawSQL, CustomTypeColumn, assignDbDataToColumn, PostgisGeographyPointColumn, exhaustive, codeToString, addCode, quoteObjectKey, pushTableDataCode, primaryKeyInnerToCode, indexInnerToCode, excludeInnerToCode, constraintInnerToCode, referencesArgsToCode, backtickQuote, TimestampTZColumn, TimestampColumn } from 'pqb';
+import { isRawSQL, escapeForMigration, ArrayColumn, toSnakeCase, toCamelCase, DomainColumn, toArray, EnumColumn, defaultSchemaConfig, snakeCaseKey, getColumnTypes, parseTableData, emptyObject, escapeString, tableDataMethods, setCurrentColumnName, consumeColumnName, Column, parseTableDataInput, UnknownColumn, setDefaultLanguage, deepCompare, raw, singleQuote, logParamToLogObject, createDbWithAdapter, getImportPath, pathToLog, emptyArray, makeColumnTypes, getStackTrace, colors, makeColumnsByType, RawSql, CustomTypeColumn, assignDbDataToColumn, PostgisGeographyPointColumn, exhaustive, codeToString, addCode, quoteObjectKey, pushTableDataCode, rawSqlToCode, primaryKeyInnerToCode, indexInnerToCode, excludeInnerToCode, constraintInnerToCode, referencesArgsToCode, backtickQuote, TimestampTZColumn, TimestampColumn } from 'pqb';
 import path, { join } from 'path';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import fs, { mkdir, writeFile, readdir, stat, readFile } from 'fs/promises';
@@ -973,6 +973,12 @@ const astToQueries = (ast, snakeCase, language) => {
     }
   }
   const prependAlterTable = [];
+  if (dropPrimaryKeys.change && addPrimaryKeys.change && dropPrimaryKeys.name === addPrimaryKeys.name && dropPrimaryKeys.columns.length === addPrimaryKeys.columns.length && dropPrimaryKeys.columns.every(
+    (column, i) => column === addPrimaryKeys.columns[i]
+  )) {
+    dropPrimaryKeys.change = addPrimaryKeys.change = void 0;
+    dropPrimaryKeys.columns.length = addPrimaryKeys.columns.length = 0;
+  }
   if (ast.drop.primaryKey || dropPrimaryKeys.change || dropPrimaryKeys.columns.length > 1) {
     const name = dropPrimaryKeys.name || `${ast.name}_pkey`;
     prependAlterTable.push(`DROP CONSTRAINT "${name}"`);
@@ -4272,7 +4278,7 @@ const makeDomainsMap = (ctx, data) => {
     });
     if (it.checks) {
       column.data.checks = it.checks.map((check) => ({
-        sql: new RawSQL([[check]])
+        sql: new RawSql([[check]])
       }));
     }
     domains[`${it.schemaName}.${it.name}`] = column;
@@ -4540,7 +4546,7 @@ const dbColumnToAst = (ctx, data, domains, tableName, item, table, tableData, ch
   const columnChecks = checks?.[item.name];
   if (columnChecks) {
     column.data.checks = columnChecks.map((check) => ({
-      sql: new RawSQL([[check]])
+      sql: new RawSql([[check]])
     }));
   }
   const camelCaseName = toCamelCase(item.name);
@@ -5147,10 +5153,12 @@ const astEncoders = {
             addCode(line, ", {");
             const u = [];
             if (change.using.usingUp) {
-              u.push(`usingUp: ${change.using.usingUp.toCode("t")},`);
+              u.push(`usingUp: ${rawSqlToCode(change.using.usingUp, "t")},`);
             }
             if (change.using.usingDown) {
-              u.push(`usingDown: ${change.using.usingDown.toCode("t")},`);
+              u.push(
+                `usingDown: ${rawSqlToCode(change.using.usingDown, "t")},`
+              );
             }
             addCode(line, u);
             addCode(line, "}");
@@ -5309,7 +5317,7 @@ const astEncoders = {
     }
     const check = ast.check;
     return [
-      `await db.addCheck(${table}, ${check.toCode("t")}${ast.name ? `, ${singleQuote(ast.name)}` : ""});`
+      `await db.addCheck(${table}, ${rawSqlToCode(check, "t")}${ast.name ? `, ${singleQuote(ast.name)}` : ""});`
     ];
   },
   renameTableItem(ast) {
@@ -5351,7 +5359,7 @@ const astEncoders = {
       }
       addCode(code, backtickQuote(sql));
     } else {
-      addCode(code, ast.sql.toCode("db"));
+      addCode(code, rawSqlToCode(ast.sql, "db"));
     }
     addCode(code, ");");
     return code;