rake-db 2.13.0 → 2.14.0

package/dist/index.d.ts

@@ -1060,7 +1060,7 @@ declare const rollback: MigrateFn;
  * Takes the same options as {@link migrate}.
  */
 declare const redo: MigrateFn;
-declare const migrateOrRollback: (trx: TransactionAdapter, config: RakeDbConfig<ColumnSchemaConfig, RakeDbColumnTypes>, files: MigrationItem[], count: number, asts: RakeDbAst[], up: boolean) => Promise<void>;
+declare const migrateOrRollback: (trx: TransactionAdapter, config: RakeDbConfig<ColumnSchemaConfig, RakeDbColumnTypes>, files: MigrationItem[], count: number, asts: RakeDbAst[], up: boolean, skipLock?: boolean) => Promise<void>;
 declare const changeCache: Record<string, ChangeCallback<RakeDbColumnTypes>[] | undefined>;
 
 /**
@@ -1103,6 +1103,8 @@ declare const rakeDb: RakeDbFn;
 
 declare const saveMigratedVersion: <SchemaConfig extends ColumnSchemaConfig, CT>(db: SilentQueries, version: string, config: RakeDbConfig<SchemaConfig, CT>) => Promise<void>;
 declare const removeMigratedVersion: <SchemaConfig extends ColumnSchemaConfig, CT>(db: SilentQueries, version: string, config: RakeDbConfig<SchemaConfig, CT>) => Promise<void>;
+declare class NoMigrationsTableError extends Error {
+}
 declare const getMigratedVersionsMap: <SchemaConfig extends ColumnSchemaConfig, CT>(db: TransactionAdapter, config: RakeDbConfig<SchemaConfig, CT>) => Promise<Record<string, boolean>>;
 
-export { AppCodeUpdater, AppCodeUpdaterParams, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DbMigration, DropMode, Migration, MigrationColumnTypes, RAKE_DB_LOCK_KEY, RakeDbAst, RakeDbConfig, SilentQueries, TableOptions, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };
+export { AppCodeUpdater, AppCodeUpdaterParams, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DbMigration, DropMode, Migration, MigrationColumnTypes, NoMigrationsTableError, RAKE_DB_LOCK_KEY, RakeDbAst, RakeDbConfig, SilentQueries, TableOptions, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };

package/dist/index.js

@@ -2205,6 +2205,8 @@ const removeMigratedVersion = async (db, version, config) => {
     })} WHERE version = '${version}'`
   );
 };
+class NoMigrationsTableError extends Error {
+}
 const getMigratedVersionsMap = async (db, config) => {
   try {
     const result = await db.arrays(
@@ -2213,10 +2215,10 @@ const getMigratedVersionsMap = async (db, config) => {
     return Object.fromEntries(result.rows.map((row) => [row[0], true]));
   } catch (err) {
     if (err.code === "42P01") {
-      await createSchemaMigrations(db, config);
-      return {};
+      throw new NoMigrationsTableError();
+    } else {
+      throw err;
     }
-    throw err;
   }
 };
 
@@ -2251,9 +2253,6 @@ function makeMigrateFn(defaultCount, up, fn) {
       const adapter = new pqb.Adapter(opts);
       try {
         await adapter.transaction(begin, async (trx) => {
-          await trx.query(
-            `SELECT pg_advisory_xact_lock('${RAKE_DB_LOCK_KEY}')`
-          );
           await fn(
             trx,
             conf,
@@ -2262,6 +2261,16 @@ function makeMigrateFn(defaultCount, up, fn) {
             localAsts
           );
         });
+      } catch (err) {
+        if (err instanceof NoMigrationsTableError) {
+          await adapter.transaction(begin, async (trx) => {
+            const config2 = conf;
+            await createSchemaMigrations(trx, config2);
+            await fn(trx, config2, files, count != null ? count : defaultCount, localAsts);
+          });
+        } else {
+          throw err;
+        }
       } finally {
         await adapter.close();
       }
@@ -2292,7 +2301,7 @@ const redo = makeMigrateFn(
   async (trx, config, files, count, asts) => {
     await migrateOrRollback(trx, config, files, count, asts, false);
     files.reverse();
-    await migrateOrRollback(trx, config, files, count, asts, true);
+    await migrateOrRollback(trx, config, files, count, asts, true, true);
     files.reverse();
   }
 );
@@ -2312,8 +2321,11 @@ function prepareConfig(config, args, count) {
     delete config.appCodeUpdater;
   return config;
 }
-const migrateOrRollback = async (trx, config, files, count, asts, up) => {
+const migrateOrRollback = async (trx, config, files, count, asts, up, skipLock) => {
   var _a, _b, _c;
+  if (!skipLock) {
+    await trx.query(`SELECT pg_advisory_xact_lock('${RAKE_DB_LOCK_KEY}')`);
+  }
   let db;
   await ((_a = config[up ? "beforeMigrate" : "beforeRollback"]) == null ? void 0 : _a.call(config, db != null ? db : db = getDb(trx)));
   const migratedVersions = await getMigratedVersionsMap(trx, config);
@@ -3908,6 +3920,7 @@ Migrate and rollback common arguments:
 `;
 
 exports.Migration = Migration;
+exports.NoMigrationsTableError = NoMigrationsTableError;
 exports.RAKE_DB_LOCK_KEY = RAKE_DB_LOCK_KEY;
 exports.changeCache = changeCache;
 exports.createDb = createDb;