orchid-orm 1.55.0 → 1.56.2

package/dist/{migrations.mjs → migrations/postgres-js.mjs}

@@ -1,11 +1,11 @@
-import { promptSelect, colors, getSchemaAndTableFromName, getDbTableColumnsChecks, dbColumnToAst, instantiateDbColumn, concatSchemaAndName, encodeColumnDefault, getIndexName, getExcludeName, getConstraintName, tableToAst, getDbStructureTableData, makeDomainsMap, astToMigration, createMigrationInterface, introspectDbSchema, exhaustive, pluralize, makeStructureToAstCtx, makeFileVersion, writeMigrationFile, migrate, structureToAst, saveMigratedVersion, rakeDbCommands } from 'rake-db';
-export * from 'rake-db';
-import { toSnakeCase, deepCompare, emptyArray, toArray, toCamelCase, addCode, codeToString, toPascalCase, getImportPath, singleQuote, quoteObjectKey, pathToLog } from 'orchid-core';
-import { EnumColumn, ArrayColumn, getColumnBaseType, RawSQL, VirtualColumn, DomainColumn, UnknownColumn, defaultSchemaConfig, columnsShapeToCode, pushTableDataCode, Adapter } from 'pqb';
+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 { EnumColumn, ArrayColumn, getColumnBaseType, RawSQL, VirtualColumn, DomainColumn, UnknownColumn, defaultSchemaConfig, columnsShapeToCode, pushTableDataCode } from 'pqb';
 import path from 'node:path';
 import { pathToFileURL } from 'url';
 import fs from 'fs/promises';
 import typescript from 'typescript';
+export * from 'rake-db/postgres-js';
 
 const compareSqlExpressions = async (tableExpressions, adapter) => {
   if (tableExpressions.length) {
@@ -16,10 +16,10 @@ const compareSqlExpressions = async (tableExpressions, adapter) => {
         const values = [];
         let result;
         try {
-          const results = await adapter.query({
+          const results = await adapter.query(
             // It is important to run `CREATE TEMPORARY VIEW` and `DROP VIEW` on the same db connection,
             // that's why SQLs are combined into a single query.
-            text: [
+            [
               `CREATE TEMPORARY VIEW ${viewName} AS (SELECT ${compare.map(
                 ({ inDb, inCode }, i) => `${inDb} AS "*inDb-${i}*", ${inCode.map(
                   (s, j) => `(${typeof s === "string" ? s : s.toSQL({ values })}) "*inCode-${i}-${j}*"`
@@ -29,7 +29,7 @@ const compareSqlExpressions = async (tableExpressions, adapter) => {
               `DROP VIEW ${viewName}`
             ].join("; "),
             values
-          });
+          );
           result = results[1];
         } catch {
         }
@@ -2005,10 +2005,10 @@ const applyCompareSql = async (compareSql, adapter) => {
   if (compareSql.expressions.length) {
     const {
       rows: [results]
-    } = await adapter.arrays({
-      text: "SELECT " + compareSql.expressions.map((x) => `${x.inDb} = (${x.inCode})`).join(", "),
-      values: compareSql.values
-    });
+    } = await adapter.arrays(
+      "SELECT " + compareSql.expressions.map((x) => `${x.inDb} = (${x.inCode})`).join(", "),
+      compareSql.values
+    );
     for (let i = 0; i < results.length; i++) {
       if (!results[i]) {
         compareSql.expressions[i].change();
@@ -2147,29 +2147,25 @@ const composeMigration = async (adapter, config, ast, dbStructure, params) => {
   return astToMigration(currentSchema, config, ast);
 };
 
+const rollbackErr = new Error("Rollback");
 const verifyMigration = async (adapter, config, migrationCode, generateMigrationParams) => {
   const migrationFn = new Function("change", migrationCode);
-  return adapter.transaction(
-    { text: "BEGIN" },
-    async (trx) => {
+  let code;
+  try {
+    await adapter.transaction(void 0, async (trx) => {
       const changeFns = [];
       migrationFn((changeCb) => {
         changeFns.push(changeCb);
       });
       const { log } = config;
       config.log = false;
-      const db = createMigrationInterface(
-        trx,
-        true,
-        config
-      );
+      const db = createMigrationInterface(trx, true, config);
       config.log = log;
       for (const changeFn of changeFns) {
         await changeFn(db, true);
       }
       const dbStructure = await introspectDbSchema(trx);
       generateMigrationParams.verifying = true;
-      let code;
       try {
         code = await composeMigration(
           trx,
@@ -2180,14 +2176,19 @@ const verifyMigration = async (adapter, config, migrationCode, generateMigration
         );
       } catch (err) {
         if (err instanceof AbortSignal) {
-          return false;
+          code = false;
+          throw rollbackErr;
         }
         throw err;
       }
-      return code;
-    },
-    { text: "ROLLBACK" }
-  );
+      throw rollbackErr;
+    });
+  } catch (err) {
+    if (err !== rollbackErr) {
+      throw err;
+    }
+  }
+  return code;
 };
 
 const report = (ast, config, currentSchema) => {
@@ -2493,10 +2494,10 @@ const dbItemName = ({ schema, name }, currentSchema) => {
 
 class AbortSignal extends Error {
 }
-const generate = async (options, config, args, afterPull) => {
+const generate = async (adapters, config, args, afterPull) => {
   let { dbPath } = config;
   if (!dbPath || !config.baseTable) throw invalidConfig(config);
-  if (!options.length) throw new Error(`Database options must not be empty`);
+  if (!adapters.length) throw new Error(`Database options must not be empty`);
   if (!dbPath.endsWith(".ts")) dbPath += ".ts";
   let migrationName = args[0] ?? "generated";
   let up;
@@ -2506,8 +2507,11 @@ const generate = async (options, config, args, afterPull) => {
   } else {
     up = args[1] === "up";
   }
-  const { dbStructure, adapters } = await migrateAndPullStructures(
-    options,
+  if (afterPull) {
+    adapters = [afterPull.adapter];
+  }
+  const { dbStructure } = await migrateAndPullStructures(
+    adapters,
     config,
     afterPull
   );
@@ -2586,7 +2590,9 @@ ${msg}`);
     }
   }
   if (up) {
-    await migrate({}, options, config, void 0, adapters);
+    for (const adapter2 of adapters) {
+      await migrateAndClose({ adapter: adapter2, config });
+    }
   } else if (!afterPull) {
     await closeAdapters(adapters);
   }
@@ -2606,7 +2612,7 @@ const getDbFromConfig = async (config, dbPath) => {
   }
   return db;
 };
-const migrateAndPullStructures = async (options, config, afterPull) => {
+const migrateAndPullStructures = async (adapters, config, afterPull) => {
   if (afterPull) {
     return {
       dbStructure: {
@@ -2621,18 +2627,12 @@ const migrateAndPullStructures = async (options, config, afterPull) => {
         enums: [],
         domains: [],
         collations: []
-      },
-      adapters: [afterPull.adapter]
+      }
     };
   }
-  const adapters = await migrate(
-    {},
-    options,
-    config,
-    void 0,
-    void 0,
-    true
-  );
+  for (const adapter of adapters) {
+    await migrate({ adapter, config });
+  }
   const dbStructures = await Promise.all(
     adapters.map((adapter) => introspectDbSchema(adapter))
   );
@@ -2640,7 +2640,7 @@ const migrateAndPullStructures = async (options, config, afterPull) => {
   for (let i = 1; i < dbStructures.length; i++) {
     compareDbStructures(dbStructure, dbStructures[i], i);
   }
-  return { dbStructure, adapters };
+  return { dbStructure };
 };
 const compareDbStructures = (a, b, i, path2) => {
   let err;
@@ -3087,7 +3087,7 @@ const applyChanges = (content, changes) => {
   ).join("") : content;
 };
 
-const pull = async (options, config) => {
+const pull = async (adapters, config) => {
   if (!config.dbPath || !config.baseTable) {
     throw new Error(
       `\`${config.dbPath ? "baseTable" : "dbPath"}\` setting must be set in the migrations config for pull command`
@@ -3095,7 +3095,6 @@ const pull = async (options, config) => {
   }
   const baseTablePath = config.baseTable.getFilePath();
   const baseTableExportedAs = config.baseTable.exportAs;
-  const adapters = options.map((opts) => new Adapter(opts));
   const [adapter] = adapters;
   const currentSchema = adapter.schema || "public";
   const ctx = makeStructureToAstCtx(config, currentSchema);
@@ -3159,13 +3158,13 @@ const pull = async (options, config) => {
   }
   await Promise.all(
     pendingFileWrites.map(
-      ([path2, content2, options2]) => fs.writeFile(path2, content2, options2).then(() => {
+      ([path2, content2, options]) => fs.writeFile(path2, content2, options).then(() => {
         config.logger?.log(`Created ${pathToLog(path2)}`);
       })
     )
   );
   const version = await makeFileVersion({}, config);
-  await generate(options, config, ["pull"], { adapter, version });
+  await generate(adapters, config, ["pull"], { adapter, version });
   await Promise.all(
     adapters.map(async (adapter2) => {
       const silentAdapter = adapter2;
@@ -3189,4 +3188,4 @@ rakeDbCommands.g = rakeDbCommands.generate = {
 };
 rakeDbCommands.pull.run = pull;
 rakeDbCommands.pull.help = "generate ORM tables and a migration for an existing database";
-//# sourceMappingURL=migrations.mjs.map
+//# sourceMappingURL=postgres-js.mjs.map