Skip to content

Commit 1e2bf36

Browse files
authored
Merge pull request #1040 from sunbit/master
Fix migration failure due to change on error messages
2 parents 7328e7a + 5da10c0 commit 1e2bf36

8 files changed

+8
-8
lines changed

lib/migrations/20150702001020-update-to-0_3_1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports = {
2121
defaultValue: 0
2222
})
2323
}).catch(function (error) {
24-
if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'shortid'" || error.message === 'column "shortid" of relation "Notes" already exists') {
24+
if (error.message === 'SQLITE_ERROR: duplicate column name: shortid' || error.message === "ER_DUP_FIELDNAME: Duplicate column name 'shortid'" || error.message === 'column "shortid" of relation "Notes" already exists') {
2525
console.log('Migration has already run… ignoring.')
2626
} else {
2727
throw error

lib/migrations/20160112220142-note-add-lastchange.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
type: Sequelize.DATE
99
})
1010
}).catch(function (error) {
11-
if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'lastchangeuserId'" || error.message === 'column "lastchangeuserId" of relation "Notes" already exists') {
11+
if (error.message === 'SQLITE_ERROR: duplicate column name: lastchangeuserId' || error.message === "ER_DUP_FIELDNAME: Duplicate column name 'lastchangeuserId'" || error.message === 'column "lastchangeuserId" of relation "Notes" already exists') {
1212
console.log('Migration has already run… ignoring.')
1313
} else {
1414
throw error

lib/migrations/20160420180355-note-add-alias.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
indicesType: 'UNIQUE'
99
})
1010
}).catch(function (error) {
11-
if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'alias'" || error.message === 'column "alias" of relation "Notes" already exists') {
11+
if (error.message === 'SQLITE_ERROR: duplicate column name: alias' || error.message === "ER_DUP_FIELDNAME: Duplicate column name 'alias'" || error.message === 'column "alias" of relation "Notes" already exists') {
1212
console.log('Migration has already run… ignoring.')
1313
} else {
1414
throw error

lib/migrations/20160515114000-user-add-tokens.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = {
44
return queryInterface.addColumn('Users', 'accessToken', Sequelize.STRING).then(function () {
55
return queryInterface.addColumn('Users', 'refreshToken', Sequelize.STRING)
66
}).catch(function (error) {
7-
if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'accessToken'" || error.message === 'column "accessToken" of relation "Users" already exists') {
7+
if (error.message === 'SQLITE_ERROR: duplicate column name: accessToken' || error.message === "ER_DUP_FIELDNAME: Duplicate column name 'accessToken'" || error.message === 'column "accessToken" of relation "Users" already exists') {
88
console.log('Migration has already run… ignoring.')
99
} else {
1010
throw error

lib/migrations/20160607060246-support-revision.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = {
1616
updatedAt: Sequelize.DATE
1717
})
1818
}).catch(function (error) {
19-
if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'savedAt'" || error.message === 'column "savedAt" of relation "Notes" already exists') {
19+
if (error.message === 'SQLITE_ERROR: duplicate column name: savedAt' | error.message === "ER_DUP_FIELDNAME: Duplicate column name 'savedAt'" || error.message === 'column "savedAt" of relation "Notes" already exists') {
2020
console.log('Migration has already run… ignoring.')
2121
} else {
2222
throw error

lib/migrations/20160703062241-support-authorship.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
updatedAt: Sequelize.DATE
1818
})
1919
}).catch(function (error) {
20-
if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'authorship'" || error.message === 'column "authorship" of relation "Notes" already exists') {
20+
if (error.message === 'SQLITE_ERROR: duplicate column name: authorship' || error.message === "ER_DUP_FIELDNAME: Duplicate column name 'authorship'" || error.message === 'column "authorship" of relation "Notes" already exists') {
2121
console.log('Migration has already run… ignoring.')
2222
} else {
2323
throw error

lib/migrations/20161009040430-support-delete-note.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
module.exports = {
33
up: function (queryInterface, Sequelize) {
44
return queryInterface.addColumn('Notes', 'deletedAt', Sequelize.DATE).catch(function (error) {
5-
if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'deletedAt'" || error.message === 'column "deletedAt" of relation "Notes" already exists') {
5+
if (error.message === 'SQLITE_ERROR: duplicate column name: deletedAt' || error.message === "ER_DUP_FIELDNAME: Duplicate column name 'deletedAt'" || error.message === 'column "deletedAt" of relation "Notes" already exists') {
66
console.log('Migration has already run… ignoring.')
77
} else {
88
throw error

lib/migrations/20161201050312-support-email-signin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = {
1010
}
1111
})
1212
}).catch(function (error) {
13-
if (error.message === "ER_DUP_FIELDNAME: Duplicate column name 'email'" || error.message === 'column "email" of relation "Users" already exists') {
13+
if (error.message === 'SQLITE_ERROR: duplicate column name: email' || error.message === "ER_DUP_FIELDNAME: Duplicate column name 'email'" || error.message === 'column "email" of relation "Users" already exists') {
1414
console.log('Migration has already run… ignoring.')
1515
} else {
1616
throw error

0 commit comments

Comments
 (0)