不要怂,就是干,撸起袖子干!

Commit 3ae83a8e by sdepold

again error catching

1 parent 3bdca874
Showing with 4 additions and 11 deletions
...@@ -56,14 +56,12 @@ module.exports = (function() { ...@@ -56,14 +56,12 @@ module.exports = (function() {
var self = this var self = this
var filterFrom = function(migrations, from, callback, options) { var filterFrom = function(migrations, from, callback, options) {
console.log('filterFrom')
var result = migrations.filter(function(migration) { return migration.isAfter(from, options) }) var result = migrations.filter(function(migration) { return migration.isAfter(from, options) })
callback && callback(result) callback && callback(null, result)
} }
var filterTo = function(migrations, to, callback, options) { var filterTo = function(migrations, to, callback, options) {
console.log('filterTo')
var result = migrations.filter(function(migration) { return migration.isBefore(to, options) }) var result = migrations.filter(function(migration) { return migration.isBefore(to, options) })
callback && callback(result) callback && callback(null, result)
} }
var migrationFiles = fs.readdirSync(this.options.path) var migrationFiles = fs.readdirSync(this.options.path)
...@@ -72,11 +70,8 @@ module.exports = (function() { ...@@ -72,11 +70,8 @@ module.exports = (function() {
return new Migration(self, self.options.path + '/' + file) return new Migration(self, self.options.path + '/' + file)
}) })
console.log('migrations')
if(this.options.from) { if(this.options.from) {
console.log('has from') filterFrom(migrations, this.options.from, function(err, migrations) {
filterFrom(migrations, this.options.from, function(migrations) {
if(self.options.to) if(self.options.to)
filterTo(migrations, self.options.to, callback) filterTo(migrations, self.options.to, callback)
else else
...@@ -84,9 +79,8 @@ console.log('migrations') ...@@ -84,9 +79,8 @@ console.log('migrations')
}) })
} else { } else {
getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) { getLastMigrationIdFromDatabase.call(this).success(function(lastMigrationId) {
console.log(lastMigrationId)
if(lastMigrationId) { if(lastMigrationId) {
filterFrom(migrations, lastMigrationId, function(migrations) { filterFrom(migrations, lastMigrationId, function(err, migrations) {
if(self.options.to) if(self.options.to)
filterTo(migrations, self.options.to, callback) filterTo(migrations, self.options.to, callback)
else else
...@@ -96,7 +90,6 @@ console.log('migrations') ...@@ -96,7 +90,6 @@ console.log('migrations')
callback && callback(null, migrations) callback && callback(null, migrations)
} }
}).error(function(err) { }).error(function(err) {
console.log(err)
callback && callback(err, null) callback && callback(err, null)
}) })
} }
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!