Skip to content

Change the arguments of syncDiff to the same as Sequelize constructor #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wkkwok wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Change the arguments of syncDiff to the same as Sequelize constructor #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e673a9
Change: Change the arguments of syncDiff.
wkkwok Feb 18, 2016
86124d4
Change: Cont. Change the arguments of syncDiff.
wkkwok Feb 18, 2016
d4bb2ca
Change: Do not sync master
wkkwok Feb 18, 2016
4766010
Change: Support URLs also
wkkwok Feb 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ module.exports = function(Sequelize) {
}
})

Sequelize.prototype.syncDiff = function(url, options) {
Sequelize.prototype.syncDiff = function(database, username, password, options) {
var self = this
var sequelize = new Sequelize(url, options || this.options)
var sequelize = new Sequelize(database, username, password, options || this.options)
this.diff_actions.forEach(function(action) {
if (!action.model) {
sequelize[action.method].apply(sequelize, action.args)
Expand All @@ -40,30 +40,30 @@ module.exports = function(Sequelize) {
}
})

return self.sync()
.then(function() {
return sequelize.sync({ force: true })
})
return sequelize.sync({ force: true })
.then(function() {
var arr = []
dbdiff.logger = function(msg) {
arr.push(msg)
}
var selfURL = self.config.protocol+'://'
if (self.config.username && self.config.password) {
selfURL += self.config.username+':'+self.config.password+'@'
}
selfURL += self.config.host
if (self.config.port) {
selfURL += ':'+self.config.port
}
selfURL += '/'+self.config.database
if (self.options.dialectOptions && self.options.dialectOptions.ssl) {
selfURL += '?ssl=true'
}

var masterConfig = {
host: self.config.host,
port: self.config.port,
user: self.config.username,
password: self.config.password,
database: self.config.database,
ssl: self.config.ssl
};
var dummyConfig = {
host: sequelize.config.host,
port: sequelize.config.port,
user: sequelize.config.username,
password: sequelize.config.password,
database: sequelize.config.database,
ssl: sequelize.config.ssl
};
return new Promise(function (resolve, reject) {
dbdiff.compareDatabases(selfURL, url, function(err) {
dbdiff.compareDatabases(masterConfig, dummyConfig, function(err) {
err ? reject(err) : resolve(arr.join('\n'))
})
})
Expand Down