orchid-orm 1.25.1 → 1.25.3

package/dist/migrations.mjs

@@ -2,8 +2,8 @@ import { promptSelect, colors, getSchemaAndTableFromName, getDbTableColumnsCheck
 export * from 'rake-db';
 import { EnumColumn, DomainColumn, RawSQL, ArrayColumn, VirtualColumn, UnknownColumn, defaultSchemaConfig, columnsShapeToCode, Adapter } from 'pqb';
 import { deepCompare, toArray, addCode, codeToString, toCamelCase, toPascalCase, getImportPath, singleQuote, quoteObjectKey, pathToLog } from 'orchid-core';
-import fs from 'fs/promises';
 import path from 'node:path';
+import fs from 'fs/promises';
 import typescript from 'typescript';
 
 const compareSqlExpressions = async (tableExpressions, adapter) => {
@@ -2238,7 +2238,7 @@ const invalidConfig = (config) => new Error(
 );
 const getDbFromConfig = async (config, dbPath) => {
   var _a, _b;
-  const module = await config.import(dbPath);
+  const module = await config.import(path.resolve(config.basePath, dbPath));
   const db = module[(_a = config.dbExportedAs) != null ? _a : "db"];
   if (!(db == null ? void 0 : db.$queryBuilder)) {
     throw new Error(
@@ -2282,7 +2282,7 @@ const migrateAndPullStructures = async (options, config, afterPull) => {
   }
   return { dbStructure, adapters };
 };
-const compareDbStructures = (a, b, i, path) => {
+const compareDbStructures = (a, b, i, path2) => {
   let err;
   if (typeof a !== typeof b) {
     err = true;
@@ -2298,7 +2298,7 @@ const compareDbStructures = (a, b, i, path) => {
           a[n],
           b[n],
           i,
-          path ? `${path}[${n}]` : String(n)
+          path2 ? `${path2}[${n}]` : String(n)
         );
       }
     } else {
@@ -2307,13 +2307,13 @@ const compareDbStructures = (a, b, i, path) => {
           a[key],
           b[key],
           i,
-          path ? `${path}.${key}` : key
+          path2 ? `${path2}.${key}` : key
         );
       }
     }
   }
   if (err) {
-    throw new Error(`${path} in the db 0 does not match db ${i}`);
+    throw new Error(`${path2} in the db 0 does not match db ${i}`);
   }
 };
 const getActualItems = async (db, currentSchema, internal, columnTypes) => {
@@ -2745,7 +2745,8 @@ const pull = async (options, config) => {
   }
   const baseTablePath = config.baseTable.getFilePath();
   const baseTableExportedAs = config.baseTable.exportAs;
-  const adapter = new Adapter(options[0]);
+  const adapters = options.map((opts) => new Adapter(opts));
+  const [adapter] = adapters;
   const currentSchema = adapter.schema || "public";
   const ctx = makeStructureToAstCtx(config, currentSchema);
   const asts = await structureToAst(ctx, adapter);
@@ -2817,10 +2818,14 @@ const pull = async (options, config) => {
   );
   const version = await makeFileVersion({}, config);
   await generate(options, config, ["pull"], { adapter, version });
-  const silentAdapter = adapter;
-  silentAdapter.silentArrays = adapter.arrays;
-  await saveMigratedVersion(silentAdapter, version, "pull.ts", config);
-  await adapter.close();
+  await Promise.all(
+    adapters.map(async (adapter2) => {
+      const silentAdapter = adapter2;
+      silentAdapter.silentArrays = adapter2.arrays;
+      await saveMigratedVersion(silentAdapter, version, "pull.ts", config);
+      await adapter2.close();
+    })
+  );
 };
 
 rakeDbCommands.g = rakeDbCommands.generate = {