knex-migrator 4.1.1 → 4.1.2

package/lib/index.js

@@ -155,30 +155,28 @@ KnexMigrator.prototype.init = function init(options) {
                                 throw err;
                             }
 
-                            return database.createTransaction(self.connection, function (transacting) {
+                            return database.createTransaction(self.connection, async function (transacting) {
+                                const existingMigrations = await transacting('migrations').select('name');
+                                const existingMigrationsNames = existingMigrations.map(m => m.name);
+
                                 // CASE: Run over all migration scripts and add the file name to the database.
-                                return Promise.each(versionsToMigrateTo, function (versionToMigrateTo) {
+                                for (const versionToMigrateTo of versionsToMigrateTo) {
                                     let versionPath = path.join(self.migrationPath, self.subfolder, versionToMigrateTo);
                                     let filesToMigrateTo = utils.listFiles(versionPath) || [];
 
-                                    return Promise.each(filesToMigrateTo, function (fileToMigrateTo) {
-                                        // CASE: check if migration exists, do not insert twice
-                                        return transacting('migrations')
-                                            .where('name', fileToMigrateTo)
-                                            .then(function (migrationExists) {
-                                                if (migrationExists.length) {
-                                                    return Promise.resolve();
-                                                }
-
-                                                return transacting('migrations')
-                                                    .insert({
-                                                        name: fileToMigrateTo,
-                                                        version: versionToMigrateTo,
-                                                        currentVersion: self.currentVersion
-                                                    });
-                                            });
-                                    });
-                                });
+                                    // CASE: check if migration exists, do not insert twice
+                                    for (const name of filesToMigrateTo) {
+                                        if (existingMigrationsNames.includes(name)) {
+                                            continue;
+                                        }
+
+                                        await transacting('migrations').insert({
+                                            name,
+                                            version: versionToMigrateTo,
+                                            currentVersion: self.currentVersion
+                                        });
+                                    }
+                                }
                             });
                         })
                         .then(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex-migrator",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "description": "Database migrations with knex.",
   "keywords": [
     "ghost",