Merge pull request #939 from SISheogorath/fix/migrationsV2

Extend migration error handling

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/migrations/20161201050312-support-email-signin.js b/lib/migrations/20161201050312-support-email-signin.js
index 4653e67a..0a8a832d 100644
--- a/lib/migrations/20161201050312-support-email-signin.js
+++ b/lib/migrations/20161201050312-support-email-signin.js
@@ -3,14 +3,14 @@ module.exports = {
   up: function (queryInterface, Sequelize) {
     return queryInterface.addColumn('Users', 'email', Sequelize.TEXT).then(function () {
       return queryInterface.addColumn('Users', 'password', Sequelize.TEXT).catch(function (error) {
-        if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'password'") {
+        if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'password'" || error.message === 'column "password" of relation "Users" already exists') {
           console.log('Migration has already run… ignoring.')
         } else {
           throw error
         }
       })
     }).catch(function (error) {
-      if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'email'") {
+      if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'email'" || error.message === 'column "email" of relation "Users" already exists') {
         console.log('Migration has already run… ignoring.')
       } else {
         throw error