rake-db 2.15.5 → 2.15.7

package/dist/index.js

@@ -105,6 +105,7 @@ var __spreadValues$a = (a, b) => {
   return a;
 };
 var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
+const versionToString = (config, version) => config.migrationId === "serial" ? `${version}`.padStart(4, "0") : `${version}`;
 const columnTypeToSql = (item) => {
   return item.data.isOfCustomType ? `"${item.toSQL()}"` : item.toSQL();
 };
@@ -2512,7 +2513,7 @@ const migrateOrRollback = async (trx, config, set, versions, count, asts, up, fo
   var _a, _b, _c;
   const { sequence, map: versionsMap } = versions;
   if (up) {
-    const rollbackTo = checkMigrationOrder(set, versions, force);
+    const rollbackTo = checkMigrationOrder(config, set, versions, force);
     if (rollbackTo) {
       let i = sequence.length - 1;
       for (; i >= 0; i--) {
@@ -2561,18 +2562,18 @@ const migrateOrRollback = async (trx, config, set, versions, count, asts, up, fo
   }
   await ((_c = config[up ? "afterMigrate" : "afterRollback"]) == null ? void 0 : _c.call(config, db != null ? db : db = getDb(trx)));
 };
-const checkMigrationOrder = (set, { sequence, map }, force) => {
+const checkMigrationOrder = (config, set, { sequence, map }, force) => {
   const last = sequence[sequence.length - 1];
   if (last) {
     for (const file of set.migrations) {
       const version = +file.version;
-      if (version > last || map[version])
+      if (version > last || map[file.version])
         continue;
       if (!force) {
         throw new Error(
           `Cannot migrate ${path.basename(
             file.path
-          )} because the higher position ${map[last]} was already migrated.
+          )} because the higher position ${map[versionToString(config, last)]} was already migrated.
 Run \`**db command** up force\` to rollback the above migrations and migrate all`
         );
       }