orchid-orm 1.26.1 → 1.26.3

package/dist/migrations.mjs

@@ -3,6 +3,7 @@ export * from 'rake-db';
 import { EnumColumn, DomainColumn, RawSQL, ArrayColumn, VirtualColumn, UnknownColumn, defaultSchemaConfig, columnsShapeToCode, pushTableDataCode, Adapter } from 'pqb';
 import { deepCompare, toArray, addCode, codeToString, toCamelCase, toPascalCase, getImportPath, singleQuote, quoteObjectKey, pathToLog } from 'orchid-core';
 import path from 'node:path';
+import { pathToFileURL } from 'url';
 import fs from 'fs/promises';
 import typescript from 'typescript';
 
@@ -1487,6 +1488,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,
@@ -1540,13 +1542,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) => {
@@ -2234,7 +2236,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(
+    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(
@@ -2755,7 +2759,7 @@ const pull = async (options, config) => {
   const [adapter] = adapters;
   const currentSchema = adapter.schema || "public";
   const ctx = makeStructureToAstCtx(config, currentSchema);
-  const asts = await structureToAst(ctx, adapter);
+  const asts = await structureToAst(ctx, adapter, config);
   const { tableInfos, fkeys } = getTableInfosAndFKeys(asts, config);
   const exclusiveWriteOptions = { flag: "wx" };
   const pendingFileWrites = [];