rake-db 2.12.7 → 2.14.0

package/dist/index.mjs

@@ -2203,6 +2203,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(
@@ -2211,10 +2213,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;
   }
 };
 
@@ -2249,9 +2251,6 @@ function makeMigrateFn(defaultCount, up, fn) {
       const adapter = new 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,
@@ -2260,6 +2259,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();
       }
@@ -2290,7 +2299,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();
   }
 );
@@ -2310,8 +2319,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);
@@ -3247,15 +3259,12 @@ const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstr
     },
     []
   );
-  const columnChecks = innerConstraints.reduce(
-    (acc, item) => {
-      if (belongsToTable(item) && isColumnCheck(item)) {
-        acc[item.check.columns[0]] = item.check.expression;
-      }
-      return acc;
-    },
-    {}
-  );
+  const columnChecks = innerConstraints.reduce((acc, item) => {
+    if (belongsToTable(item) && isColumnCheck(item)) {
+      acc[item.check.columns[0]] = item.check.expression;
+    }
+    return acc;
+  }, {});
   const shape = makeColumnsShape(
     ctx,
     data,
@@ -3908,5 +3917,5 @@ Migrate and rollback common arguments:
   --code false            do not run code updater
 `;
 
-export { Migration, RAKE_DB_LOCK_KEY, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };
+export { Migration, NoMigrationsTableError, RAKE_DB_LOCK_KEY, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, redo, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };
 //# sourceMappingURL=index.mjs.map