Use Promise instead of Utils.Promise

lib/dialects/sqlite/query-interface.js

 'use strict';
 'use strict';
 
 
-var Utils = require('../../utils');
+var Utils = require('../../utils')
+  , Promise = require('../../promise');
 
 
 /**
 /**
  Returns an object that treats SQLite's inabilities to do certain queries.
  Returns an object that treats SQLite's inabilities to do certain queries.
@@ -32,7 +33,7 @@ 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 !== ''; });
 
 
-      return Utils.Promise.each(subQueries, function(subQuery) {
+      return Promise.each(subQueries, function(subQuery) {
         return self.sequelize.query(subQuery + ';', null, { raw: true});
         return self.sequelize.query(subQuery + ';', null, { raw: true});
       });
       });
     });
     });
@@ -63,7 +64,7 @@ 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 !== ''; });
 
 
-      return Utils.Promise.each(subQueries, function(subQuery) {
+      return Promise.each(subQueries, function(subQuery) {
         return self.sequelize.query(subQuery + ';', null, { raw: true});
         return self.sequelize.query(subQuery + ';', null, { raw: true});
       });
       });
     });
     });
@@ -94,7 +95,7 @@ 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 !== ''; });
 
 
-      return Utils.Promise.each(subQueries, function(subQuery) {
+      return Promise.each(subQueries, function(subQuery) {
         return self.sequelize.query(subQuery + ';', null, { raw: true});
         return self.sequelize.query(subQuery + ';', null, { raw: true});
       });
       });
     });
     });

lib/query-interface.js

@@ -233,7 +233,7 @@ module.exports = (function() {
     options = options || {};
     options = options || {};
 
 
     var dropAllTables = function(tableNames) {
     var dropAllTables = function(tableNames) {
-      return Utils.Promise.each(tableNames, function(tableName) {
+      return Promise.each(tableNames, function(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.tableName || tableName) === -1) {
         if (skip.indexOf(tableName.tableName || tableName) === -1) {
           return self.dropTable(tableName, { cascade: true });
           return self.dropTable(tableName, { cascade: true });
@@ -273,7 +273,7 @@ module.exports = (function() {
             });
             });
           });
           });
 
 
-          return Utils.Promise.all(promises).then(function() {
+          return Promise.all(promises).then(function() {
             return dropAllTables(tableNames);
             return dropAllTables(tableNames);
           });
           });
         });
         });
@@ -283,7 +283,7 @@ module.exports = (function() {
 
 
   QueryInterface.prototype.dropAllEnums = function(options) {
   QueryInterface.prototype.dropAllEnums = function(options) {
     if (this.sequelize.getDialect() !== 'postgres') {
     if (this.sequelize.getDialect() !== 'postgres') {
-      return Utils.Promise.resolve();
+      return Promise.resolve();
     }
     }
 
 
     options = options || {};
     options = options || {};
@@ -461,10 +461,10 @@ module.exports = (function() {
     var self = this;
     var self = this;
 
 
     if (tableNames.length === 0) {
     if (tableNames.length === 0) {
-      return Utils.Promise.resolve({});
+      return Promise.resolve({});
     }
     }
 
 
-    return Utils.Promise.map(tableNames, function(tableName) {
+    return Promise.map(tableNames, function(tableName) {
       return self.sequelize.query(self.QueryGenerator.getForeignKeysQuery(tableName, self.sequelize.config.database)).get(0);
       return self.sequelize.query(self.QueryGenerator.getForeignKeysQuery(tableName, self.sequelize.config.database)).get(0);
     }).then(function(results) {
     }).then(function(results) {
       var result = {};
       var result = {};
@@ -747,7 +747,7 @@ module.exports = (function() {
     if (sql) {
     if (sql) {
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
     } else {
     } else {
-      return Utils.Promise.resolve();
+      return Promise.resolve();
     }
     }
   };
   };
 
 
@@ -756,7 +756,7 @@ module.exports = (function() {
     if (sql) {
     if (sql) {
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
     } else {
     } else {
-      return Utils.Promise.resolve();
+      return Promise.resolve();
     }
     }
   };
   };
 
 
@@ -765,7 +765,7 @@ module.exports = (function() {
     if (sql) {
     if (sql) {
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
     } else {
     } else {
-      return Utils.Promise.resolve();
+      return Promise.resolve();
     }
     }
   };
   };
 
 
@@ -774,7 +774,7 @@ module.exports = (function() {
     if (sql) {
     if (sql) {
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
     } else {
     } else {
-      return Utils.Promise.resolve();
+      return Promise.resolve();
     }
     }
   };
   };
 
 
@@ -783,7 +783,7 @@ module.exports = (function() {
     if (sql) {
     if (sql) {
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
     } else {
     } else {
-      return Utils.Promise.resolve();
+      return Promise.resolve();
     }
     }
   };
   };
 
 
@@ -792,7 +792,7 @@ module.exports = (function() {
     if (sql) {
     if (sql) {
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
       return this.sequelize.query(sql, null, {logging: this.sequelize.options.logging});
     } else {
     } else {
-      return Utils.Promise.resolve();
+      return Promise.resolve();
     }
     }
   };
   };
 
 
@@ -840,7 +840,7 @@ module.exports = (function() {
     if (sql) {
     if (sql) {
       return this.sequelize.query(sql, null, { transaction: transaction });
       return this.sequelize.query(sql, null, { transaction: transaction });
     } else {
     } else {
-      return Utils.Promise.resolve();
+      return Promise.resolve();
     }
     }
   };
   };
 
 
@@ -858,7 +858,7 @@ module.exports = (function() {
     if (sql) {
     if (sql) {
       return this.sequelize.query(sql, null, { transaction: transaction });
       return this.sequelize.query(sql, null, { transaction: transaction });
     } else {
     } else {
-      return Utils.Promise.resolve();
+      return Promise.resolve();
     }
     }
   };
   };
 
 
@@ -891,7 +891,7 @@ module.exports = (function() {
     if (sql) {
     if (sql) {
       return this.sequelize.query(sql, null, options);
       return this.sequelize.query(sql, null, options);
     } else {
     } else {
-      return Utils.Promise.resolve();
+      return Promise.resolve();
     }
     }
   };
   };