orchid-orm 1.25.1 → 1.25.3

package/dist/migrations.js

@@ -3,8 +3,8 @@
 var rakeDb = require('rake-db');
 var pqb = require('pqb');
 var orchidCore = require('orchid-core');
-var fs = require('fs/promises');
 var path = require('node:path');
+var fs = require('fs/promises');
 var typescript = require('typescript');
 
 const compareSqlExpressions = async (tableExpressions, adapter) => {
@@ -2239,7 +2239,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(
@@ -2283,7 +2283,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;
@@ -2299,7 +2299,7 @@ const compareDbStructures = (a, b, i, path) => {
           a[n],
           b[n],
           i,
-          path ? `${path}[${n}]` : String(n)
+          path2 ? `${path2}[${n}]` : String(n)
         );
       }
     } else {
@@ -2308,13 +2308,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) => {
@@ -2746,7 +2746,8 @@ const pull = async (options, config) => {
   }
   const baseTablePath = config.baseTable.getFilePath();
   const baseTableExportedAs = config.baseTable.exportAs;
-  const adapter = new pqb.Adapter(options[0]);
+  const adapters = options.map((opts) => new pqb.Adapter(opts));
+  const [adapter] = adapters;
   const currentSchema = adapter.schema || "public";
   const ctx = rakeDb.makeStructureToAstCtx(config, currentSchema);
   const asts = await rakeDb.structureToAst(ctx, adapter);
@@ -2818,10 +2819,14 @@ const pull = async (options, config) => {
   );
   const version = await rakeDb.makeFileVersion({}, config);
   await generate(options, config, ["pull"], { adapter, version });
-  const silentAdapter = adapter;
-  silentAdapter.silentArrays = adapter.arrays;
-  await rakeDb.saveMigratedVersion(silentAdapter, version, "pull.ts", config);
-  await adapter.close();
+  await Promise.all(
+    adapters.map(async (adapter2) => {
+      const silentAdapter = adapter2;
+      silentAdapter.silentArrays = adapter2.arrays;
+      await rakeDb.saveMigratedVersion(silentAdapter, version, "pull.ts", config);
+      await adapter2.close();
+    })
+  );
 };
 
 rakeDb.rakeDbCommands.g = rakeDb.rakeDbCommands.generate = {