orchid-orm 1.26.1 → 1.26.3

package/dist/migrations.js

@@ -4,6 +4,7 @@ var rakeDb = require('rake-db');
 var pqb = require('pqb');
 var orchidCore = require('orchid-core');
 var path = require('node:path');
+var url = require('url');
 var fs = require('fs/promises');
 var typescript = require('typescript');
 
@@ -1488,6 +1489,7 @@ const processTables = async (ast, structureToAstCtx, domainsMap, adapter, tables
   const compareSql = { values: [], expressions: [] };
   const tableExpressions = [];
   const { changeTables, changeTableSchemas, dropTables, tableShapes } = collectChangeAndDropTables(
+    config,
     tables,
     dbStructure,
     currentSchema,
@@ -1541,13 +1543,13 @@ const collectCreateTables = (tables, dbStructure, currentSchema) => {
     return acc;
   }, []);
 };
-const collectChangeAndDropTables = (tables, dbStructure, currentSchema, createTables) => {
+const collectChangeAndDropTables = (config, tables, dbStructure, currentSchema, createTables) => {
   const changeTables = [];
   const changeTableSchemas = [];
   const dropTables = [];
   const tableShapes = {};
   for (const dbTable of dbStructure.tables) {
-    if (dbTable.name === "schemaMigrations")
+    if (dbTable.name === config.migrationsTable)
       continue;
     const codeTable = tables.find(
       (t) => {
@@ -2235,7 +2237,9 @@ const invalidConfig = (config) => new Error(
 );
 const getDbFromConfig = async (config, dbPath) => {
   var _a, _b;
-  const module = await config.import(path.resolve(config.basePath, dbPath));
+  const module = await config.import(
+    url.pathToFileURL(path.resolve(config.basePath, dbPath)).toString()
+  );
   const db = module[(_a = config.dbExportedAs) != null ? _a : "db"];
   if (!(db == null ? void 0 : db.$queryBuilder)) {
     throw new Error(
@@ -2756,7 +2760,7 @@ const pull = async (options, config) => {
   const [adapter] = adapters;
   const currentSchema = adapter.schema || "public";
   const ctx = rakeDb.makeStructureToAstCtx(config, currentSchema);
-  const asts = await rakeDb.structureToAst(ctx, adapter);
+  const asts = await rakeDb.structureToAst(ctx, adapter, config);
   const { tableInfos, fkeys } = getTableInfosAndFKeys(asts, config);
   const exclusiveWriteOptions = { flag: "wx" };
   const pendingFileWrites = [];