Merge pull request #2925 from mbroadst/show-table-query-type

add QueryTypes.SHOWTABLES

lib/dialects/abstract/query.js

@@ -123,11 +123,11 @@ module.exports = (function() {
     }
   };
 
-  AbstractQuery.prototype.isShowTableQuery = function() {
-    return (this.sql.toLowerCase().indexOf('show tables') === 0);
+  AbstractQuery.prototype.isShowTablesQuery = function() {
+    return this.options.type === QueryTypes.SHOWTABLES;
   };
 
-  AbstractQuery.prototype.handleShowTableQuery = function(results) {
+  AbstractQuery.prototype.handleShowTablesQuery = function(results) {
     return Utils._.flatten(results.map(function(resultSet) {
       return Utils._.values(resultSet);
     }));

lib/dialects/mssql/query.js

@@ -123,8 +123,8 @@ module.exports = (function() {
       }
     }
 
-    if (this.isShowTableQuery()) {
-      result = this.handleShowTableQuery(data);
+    if (this.isShowTablesQuery()) {
+      result = this.handleShowTablesQuery(data);
     } else if (this.isShowOrDescribeQuery()) {
       result = data;
       if (this.sql.toLowerCase().indexOf("select c.column_name as 'name', c.data_type as 'type', c.is_nullable as 'isnull'") === 0) {
@@ -157,10 +157,6 @@ module.exports = (function() {
     return result;
   };
 
-  Query.prototype.isShowTableQuery = function() {
-    return (this.sql.toLowerCase().indexOf('select name from sys.tables') === 0);
-  };
-
   Query.prototype.formatError = function (err) {
     var match;
     match = err.message.match(/Violation of UNIQUE KEY constraint '((.|\s)*)'. Cannot insert duplicate key in object '.*'. The duplicate key value is \((.*)\)./);

lib/dialects/mysql/query.js

@@ -75,8 +75,8 @@ module.exports = (function() {
 
     if (this.isSelectQuery()) {
       result = this.handleSelectQuery(data);
-    } else if (this.isShowTableQuery()) {
-      result = this.handleShowTableQuery(data);
+    } else if (this.isShowTablesQuery()) {
+      result = this.handleShowTablesQuery(data);
     } else if (this.isShowOrDescribeQuery()) {
       result = data;
 

lib/query-interface.js

@@ -163,7 +163,7 @@ module.exports = (function() {
           schema: options.schema
         });
       }
-      
+
       attributes = self.QueryGenerator.attributesToSQL(attributes, {
         context: 'createTable'
       });
@@ -286,11 +286,11 @@ module.exports = (function() {
     var self = this;
     options = Utils._.extend({
       transaction: null,
-      raw: true
+      raw: true,
+      type: QueryTypes.SHOWTABLES
     }, options || {});
 
     var showTablesSql = self.QueryGenerator.showTablesQuery();
-
     return self.sequelize.query(showTablesSql, null, options).then(function(tableNames) {
       return Utils._.flatten(tableNames);
     });
@@ -605,7 +605,7 @@ module.exports = (function() {
         dao[cascades[i]]().success(function(tasks) {
           if (tasks === null || tasks.length < 1) {
             if (i >= cascades.length) {
-              return resolve();  
+              return resolve();
             } else {
               tick++;
               return iterate(null, tick);

lib/query-types.js

@@ -6,5 +6,6 @@ module.exports = {
   BULKUPDATE: 'BULKUPDATE',
   BULKDELETE: 'BULKDELETE',
   UPSERT: 'UPSERT',
-  VERSION: 'VERSION'
+  VERSION: 'VERSION',
+  SHOWTABLES: 'SHOWTABLES'
 };