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

Commit 156c98ce by Jan Aagaard Meier

Change the remaining spots of code to use the new promise.reduce syntax

1 parent 46c6e537
...@@ -32,10 +32,9 @@ var QueryInterface = module.exports = { ...@@ -32,10 +32,9 @@ var QueryInterface = module.exports = {
var sql = self.QueryGenerator.removeColumnQuery(tableName, fields) var sql = self.QueryGenerator.removeColumnQuery(tableName, fields)
, subQueries = sql.split(';').filter(function(q) { return q !== ''; }); , subQueries = sql.split(';').filter(function(q) { return q !== ''; });
subQueries.unshift(null);
return Utils.Promise.reduce(subQueries, function(total, subQuery) { return Utils.Promise.reduce(subQueries, function(total, subQuery) {
return self.sequelize.query(subQuery + ';', null, { raw: true}); return self.sequelize.query(subQuery + ';', null, { raw: true});
}); }, null);
}); });
}, },
...@@ -64,10 +63,9 @@ var QueryInterface = module.exports = { ...@@ -64,10 +63,9 @@ var QueryInterface = module.exports = {
var sql = self.QueryGenerator.removeColumnQuery(tableName, fields) var sql = self.QueryGenerator.removeColumnQuery(tableName, fields)
, subQueries = sql.split(';').filter(function(q) { return q !== ''; }); , subQueries = sql.split(';').filter(function(q) { return q !== ''; });
subQueries.unshift(null);
return Utils.Promise.reduce(subQueries, function(total, subQuery) { return Utils.Promise.reduce(subQueries, function(total, subQuery) {
return self.sequelize.query(subQuery + ';', null, { raw: true}); return self.sequelize.query(subQuery + ';', null, { raw: true});
}); }, null);
}); });
}, },
...@@ -96,10 +94,9 @@ var QueryInterface = module.exports = { ...@@ -96,10 +94,9 @@ var QueryInterface = module.exports = {
var sql = self.QueryGenerator.renameColumnQuery(tableName, attrNameBefore, attrNameAfter, fields) var sql = self.QueryGenerator.renameColumnQuery(tableName, attrNameBefore, attrNameAfter, fields)
, subQueries = sql.split(';').filter(function(q) { return q !== ''; }); , subQueries = sql.split(';').filter(function(q) { return q !== ''; });
subQueries.unshift(null);
return Utils.Promise.reduce(subQueries, function(total, subQuery) { return Utils.Promise.reduce(subQueries, function(total, subQuery) {
return self.sequelize.query(subQuery + ';', null, { raw: true}); return self.sequelize.query(subQuery + ';', null, { raw: true});
}); }, null);
}); });
} }
}; };
...@@ -192,13 +192,12 @@ module.exports = (function() { ...@@ -192,13 +192,12 @@ module.exports = (function() {
options = options || {}; options = options || {};
var dropAllTables = function(tableNames) { var dropAllTables = function(tableNames) {
tableNames.unshift(null);
return Utils.Promise.reduce(tableNames, function(total, tableName) { return Utils.Promise.reduce(tableNames, function(total, tableName) {
// if tableName is not in the Array of tables names then dont drop it // if tableName is not in the Array of tables names then dont drop it
if (skip.indexOf(tableName) === -1) { if (skip.indexOf(tableName) === -1) {
return self.dropTable(tableName, { cascade: true }); return self.dropTable(tableName, { cascade: true });
} }
}); }, null);
}; };
var skip = options.skip || []; var skip = options.skip || [];
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!