knex-migrator 5.0.7 → 5.0.9

package/lib/index.js

@@ -1102,7 +1102,7 @@ KnexMigrator.prototype._afterEach = function _afterEach(options) {
  * @returns {Bluebird<any>}
  * @private
  */
-KnexMigrator.prototype._integrityCheck = function _integrityCheck(options) {
+KnexMigrator.prototype._integrityCheck = async function _integrityCheck(options) {
     options = options || {};
 
     let self = this,
@@ -1124,97 +1124,98 @@ KnexMigrator.prototype._integrityCheck = function _integrityCheck(options) {
         // ignore
     }
 
-    return this
-        .connection('migrations')
-        .select('version')
-        .count('version', {as: 'c'})
-        .groupBy('version')
-        .then((dbMigrations) => {
-            _.each(folders, function (folder) {
-                // CASE: versions/1.1-members or versions/2.0-payments
-                if (folder !== 'init') {
-                    try {
-                        folder = folder.match(/([\d._]+)/)[0];
-                    } catch (err) {
-                        logging.warn('Cannot parse folder name.');
-                        logging.warn('Ignore Folder: ' + folder);
-                        return;
-                    }
+    try {
+        const dbMigrations = await this
+            .connection('migrations')
+            .select('version')
+            .count('version', {as: 'c'})
+            .groupBy('version');
+
+        _.each(folders, function (folder) {
+            // CASE: versions/1.1-members or versions/2.0-payments
+            if (folder !== 'init') {
+                try {
+                    folder = folder.match(/([\d._]+)/)[0];
+                } catch (err) {
+                    logging.warn('Cannot parse folder name.');
+                    logging.warn('Ignore Folder: ' + folder);
+                    return;
                 }
+            }
 
-                // CASE:
-                // if your current version is 1.0 and you add migration scripts for the next version 1.1
-                // we won't execute them until your current version changes to 1.1 or until you force KM to migrate to it
-                if (self.currentVersion && !force) {
-                    if (utils.isGreaterThanVersion({smallerVersion: self.currentVersion, greaterVersion: folder})) {
-                        futureVersions.push(folder);
-                    }
+            // CASE:
+            // if your current version is 1.0 and you add migration scripts for the next version 1.1
+            // we won't execute them until your current version changes to 1.1 or until you force KM to migrate to it
+            if (self.currentVersion && !force) {
+                if (utils.isGreaterThanVersion({smallerVersion: self.currentVersion, greaterVersion: folder})) {
+                    futureVersions.push(folder);
                 }
+            }
 
-                let actual = 0;
-                let expected;
+            let actual = 0;
+            let expected;
 
-                const migrationCount = dbMigrations.find(m => m.version === folder);
-                if (migrationCount) {
-                    actual = migrationCount.c;
-                }
+            const migrationCount = dbMigrations.find(m => m.version === folder);
+            if (migrationCount) {
+                actual = migrationCount.c;
+            }
 
-                if (folder !== 'init') {
-                    expected = utils.listFiles(path.join(self.migrationPath, subfolder, folder)).length;
-                } else {
-                    expected = utils.listFiles(path.join(self.migrationPath, folder)).length;
-                }
+            if (folder !== 'init') {
+                expected = utils.listFiles(path.join(self.migrationPath, subfolder, folder)).length;
+            } else {
+                expected = utils.listFiles(path.join(self.migrationPath, folder)).length;
+            }
 
-                debug('Version ' + folder + ' expected: ' + expected);
-                debug('Version ' + folder + ' actual: ' + actual);
+            debug('Version ' + folder + ' expected: ' + expected);
+            debug('Version ' + folder + ' actual: ' + actual);
 
-                toReturn[folder] = {
-                    expected: expected,
-                    actual: actual
-                };
-            });
+            toReturn[folder] = {
+                expected: expected,
+                actual: actual
+            };
+        });
 
-            // CASE: ensure that either you have to run `migrate --force` or they ran already
-            if (futureVersions.length) {
-                _.each(futureVersions, function (futureVersion) {
-                    if (toReturn[futureVersion].actual !== toReturn[futureVersion].expected) {
-                        logging.warn('knex-migrator is skipping ' + futureVersion);
-                        logging.warn('Current version in MigratorConfig.js is smaller then requested version, use --force to proceed!');
-                        logging.warn('Please run `yarn knex-migrator migrate --v ' + futureVersion + ' --force` to proceed!');
-                        delete toReturn[futureVersion];
-                    }
-                });
-            }
+        // CASE: ensure that either you have to run `migrate --force` or they ran already
+        if (futureVersions.length) {
+            _.each(futureVersions, function (futureVersion) {
+                if (toReturn[futureVersion].actual !== toReturn[futureVersion].expected) {
+                    logging.warn('knex-migrator is skipping ' + futureVersion);
+                    logging.warn('Current version in MigratorConfig.js is smaller then requested version, use --force to proceed!');
+                    logging.warn('Please run `yarn knex-migrator migrate --v ' + futureVersion + ' --force` to proceed!');
+                    delete toReturn[futureVersion];
+                }
+            });
+        }
 
-            return toReturn;
-        }).catch(function onMigrationsLookupError(err) {
-            // CASE: no database selected (database.connection.database="")
-            if (err.errno === 1046) {
-                throw new errors.DatabaseIsNotOkError({
-                    message: 'Please define a target database in your configuration.',
-                    help: 'database: {\n\tconnection:\n\t\tdatabase:"database_name"\n\t}\n}\n',
-                    code: 'DB_NOT_INITIALISED'
-                });
-            }
+        return toReturn;
+    } catch (err) {
+        // CASE: no database selected (database.connection.database="")
+        if (err.errno === 1046) {
+            throw new errors.DatabaseIsNotOkError({
+                message: 'Please define a target database in your configuration.',
+                help: 'database: {\n\tconnection:\n\t\tdatabase:"database_name"\n\t}\n}\n',
+                code: 'DB_NOT_INITIALISED'
+            });
+        }
 
-            // CASE: database does not exist
-            if (err.errno === 1049) {
-                throw new errors.DatabaseIsNotOkError({
-                    message: 'Please run `yarn knex-migrator init`',
-                    code: 'DB_NOT_INITIALISED'
-                });
-            }
+        // CASE: database does not exist
+        if (err.errno === 1049) {
+            throw new errors.DatabaseIsNotOkError({
+                message: 'Please run `yarn knex-migrator init`',
+                code: 'DB_NOT_INITIALISED'
+            });
+        }
 
-            // CASE: migration table does not exist
-            if (err.errno === 1 || err.errno === 1146) {
-                throw new errors.DatabaseIsNotOkError({
-                    message: 'Please run `yarn knex-migrator init`',
-                    code: 'MIGRATION_TABLE_IS_MISSING'
-                });
-            }
+        // CASE: migration table does not exist
+        if (err.errno === 1 || err.errno === 1146) {
+            throw new errors.DatabaseIsNotOkError({
+                message: 'Please run `yarn knex-migrator init`',
+                code: 'MIGRATION_TABLE_IS_MISSING'
+            });
+        }
 
-            throw err;
-        });
+        throw err;
+    }
 };
 
 module.exports = KnexMigrator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knex-migrator",
-  "version": "5.0.7",
+  "version": "5.0.9",
   "description": "Database migrations with knex.",
   "keywords": [
     "ghost",
@@ -47,9 +47,9 @@
     "node": "^14.17.0 || ^16.13.0"
   },
   "dependencies": {
-    "@tryghost/database-info": "0.3.10",
-    "@tryghost/errors": "1.2.17",
-    "@tryghost/logging": "2.3.2",
+    "@tryghost/database-info": "0.3.14",
+    "@tryghost/errors": "1.2.20",
+    "@tryghost/logging": "2.3.6",
     "bluebird": "3.7.2",
     "commander": "5.1.0",
     "compare-ver": "2.0.2",
@@ -77,6 +77,6 @@
     "sinon": "9.2.4"
   },
   "optionalDependencies": {
-    "sqlite3": "5.1.2"
+    "sqlite3": "5.1.4"
   }
 }