Fixed show schemas and desribe table for pg

changelog.md

@@ -13,7 +13,6 @@
 #### Backwards compatability changes
 #### Backwards compatability changes
 - The default query type for `sequelize.query` is now `RAW` - this means that two arguments (results and metadata) will be returned by default and you should use `.spread`
 - The default query type for `sequelize.query` is now `RAW` - this means that two arguments (results and metadata) will be returned by default and you should use `.spread`
 - The 4th argument to `sequelize.query` has been deprecated in favor of `options.replacements`
 - The 4th argument to `sequelize.query` has been deprecated in favor of `options.replacements`
->>>>>>> Clean up test and added docs for rewamped raw query handling
 
 
 # 2.0.0-rc7
 # 2.0.0-rc7
 - [FEATURE] Throw an error if no where clause is given to `Model.destroy()`.
 - [FEATURE] Throw an error if no where clause is given to `Model.destroy()`.

lib/dialects/abstract/query.js

@@ -141,6 +141,10 @@ module.exports = (function() {
     return this.options.type === QueryTypes.SHOWINDEXES;
     return this.options.type === QueryTypes.SHOWINDEXES;
   };
   };
 
 
+  AbstractQuery.prototype.isDescribeQuery = function () {
+    return this.options.type === QueryTypes.DESCRIBE;
+  };
+
   AbstractQuery.prototype.isSelectQuery = function() {
   AbstractQuery.prototype.isSelectQuery = function() {
     return this.options.type === QueryTypes.SELECT;
     return this.options.type === QueryTypes.SELECT;
   };
   };

lib/dialects/mssql/query.js

@@ -129,23 +129,20 @@ module.exports = (function() {
 
 
     if (this.isShowTablesQuery()) {
     if (this.isShowTablesQuery()) {
       result = this.handleShowTablesQuery(data);
       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) {
-        result = {};
-        data.forEach(function(_result) {
-          if (_result.Default)
-            _result.Default = _result.Default.replace('(\'','').replace('\')','').replace(/'/g,'');
-
-          result[_result.Name] = {
-            type: _result.Type.toUpperCase(),
-            allowNull: (_result.IsNull === 'YES' ? true : false),
-            defaultValue: _result.Default
-          };
-        });
-      } else if (this.isShowIndexesQuery()) {
-        result = this.handleShowIndexesQuery(data);
-      }
+    } else if (this.isDescribeQuery()) {
+      result = {};
+      data.forEach(function(_result) {
+        if (_result.Default)
+          _result.Default = _result.Default.replace('(\'','').replace('\')','').replace(/'/g,'');
+
+        result[_result.Name] = {
+          type: _result.Type.toUpperCase(),
+          allowNull: (_result.IsNull === 'YES' ? true : false),
+          defaultValue: _result.Default
+        };
+      });
+    } else if (this.isShowIndexesQuery()) {
+      result = this.handleShowIndexesQuery(data);
     } else if (this.isSelectQuery()) {
     } else if (this.isSelectQuery()) {
       result = this.handleSelectQuery(data);
       result = this.handleSelectQuery(data);
     } else if (this.isCallQuery()) {
     } else if (this.isCallQuery()) {

lib/dialects/mysql/query.js

@@ -76,22 +76,19 @@ module.exports = (function() {
       result = this.handleSelectQuery(data);
       result = this.handleSelectQuery(data);
     } else if (this.isShowTablesQuery()) {
     } else if (this.isShowTablesQuery()) {
       result = this.handleShowTablesQuery(data);
       result = this.handleShowTablesQuery(data);
-    } else if (this.isShowOrDescribeQuery()) {
-      result = data;
-
-      if (this.sql.toLowerCase().indexOf('describe') === 0) {
-        result = {};
-
-        data.forEach(function(_result) {
-          result[_result.Field] = {
-            type: _result.Type.toUpperCase(),
-            allowNull: (_result.Null === 'YES'),
-            defaultValue: _result.Default
-          };
-        });
-      } else if (this.isShowIndexesQuery()) {
-        result = this.handleShowIndexesQuery(data);
-      }
+    } else if (this.isDescribeQuery()) {
+      result = {};
+
+      data.forEach(function(_result) {
+        result[_result.Field] = {
+          type: _result.Type.toUpperCase(),
+          allowNull: (_result.Null === 'YES'),
+          defaultValue: _result.Default
+        };
+      });
+    } else if (this.isShowIndexesQuery()) {
+      result = this.handleShowIndexesQuery(data);
+
     } else if (this.isCallQuery()) {
     } else if (this.isCallQuery()) {
       result = data[0];
       result = data[0];
     } else if (this.isBulkUpdateQuery() || this.isBulkDeleteQuery() || this.isUpsertQuery()) {
     } else if (this.isBulkUpdateQuery() || this.isBulkDeleteQuery() || this.isUpsertQuery()) {

lib/dialects/postgres/query.js

@@ -147,62 +147,60 @@ module.exports = (function() {
         });
         });
         return result;
         return result;
       } else if (self.isSelectQuery()) {
       } else if (self.isSelectQuery()) {
-        if (self.sql.toLowerCase().indexOf('select c.column_name') === 0) {
-          result = {};
-
-          rows.forEach(function(_result) {
-            result[_result.Field] = {
-              type: _result.Type.toUpperCase(),
-              allowNull: (_result.Null === 'YES'),
-              defaultValue: _result.Default,
-              special: (!!_result.special ? self.sequelize.queryInterface.QueryGenerator.fromArray(_result.special) : [])
-            };
+        // Postgres will treat tables as case-insensitive, so fix the case
+        // of the returned values to match attributes
+        if (self.options.raw === false && self.sequelize.options.quoteIdentifiers === false) {
+          var attrsMap = Utils._.reduce(self.callee.attributes, function(m, v, k) { m[k.toLowerCase()] = k; return m; }, {});
+          rows.forEach(function(row) {
+            Utils._.keys(row).forEach(function(key) {
+              var targetAttr = attrsMap[key];
+              if (targetAttr !== key) {
+                row[targetAttr] = row[key];
+                delete row[key];
+              }
+            });
+          });
+        }
 
 
-            if (result[_result.Field].type === 'BOOLEAN') {
-              result[_result.Field].defaultValue = { 'false': false, 'true': true }[result[_result.Field].defaultValue];
+        if (!!self.callee && !!self.callee._hasHstoreAttributes) {
+          rows.forEach(function(row) {
+            parseHstoreFields(self.callee, row);
+          });
+        }
 
 
-              if (result[_result.Field].defaultValue === undefined) {
-                result[_result.Field].defaultValue = null;
-              }
+        return self.handleSelectQuery(rows);
+      } else if (QueryTypes.DESCRIBE === self.options.type) {
+        result = {};
+
+        rows.forEach(function(_result) {
+          result[_result.Field] = {
+            type: _result.Type.toUpperCase(),
+            allowNull: (_result.Null === 'YES'),
+            defaultValue: _result.Default,
+            special: (!!_result.special ? self.sequelize.queryInterface.QueryGenerator.fromArray(_result.special) : [])
+          };
+
+          if (result[_result.Field].type === 'BOOLEAN') {
+            result[_result.Field].defaultValue = { 'false': false, 'true': true }[result[_result.Field].defaultValue];
+
+            if (result[_result.Field].defaultValue === undefined) {
+              result[_result.Field].defaultValue = null;
             }
             }
+          }
 
 
-            if (typeof result[_result.Field].defaultValue === 'string') {
-              result[_result.Field].defaultValue = result[_result.Field].defaultValue.replace(/'/g, '');
+          if (typeof result[_result.Field].defaultValue === 'string') {
+            result[_result.Field].defaultValue = result[_result.Field].defaultValue.replace(/'/g, '');
 
 
-              if (result[_result.Field].defaultValue.indexOf('::') > -1) {
-                var split = result[_result.Field].defaultValue.split('::');
-                if (split[1].toLowerCase() !== 'regclass)') {
-                  result[_result.Field].defaultValue = split[0];
-                }
+            if (result[_result.Field].defaultValue.indexOf('::') > -1) {
+              var split = result[_result.Field].defaultValue.split('::');
+              if (split[1].toLowerCase() !== 'regclass)') {
+                result[_result.Field].defaultValue = split[0];
               }
               }
             }
             }
-          });
-
-          return result;
-        } else {
-          // Postgres will treat tables as case-insensitive, so fix the case
-          // of the returned values to match attributes
-          if (self.options.raw === false && self.sequelize.options.quoteIdentifiers === false) {
-            var attrsMap = Utils._.reduce(self.callee.attributes, function(m, v, k) { m[k.toLowerCase()] = k; return m; }, {});
-            rows.forEach(function(row) {
-              Utils._.keys(row).forEach(function(key) {
-                var targetAttr = attrsMap[key];
-                if (targetAttr !== key) {
-                  row[targetAttr] = row[key];
-                  delete row[key];
-                }
-              });
-            });
-          }
-
-          if (!!self.callee && !!self.callee._hasHstoreAttributes) {
-            rows.forEach(function(row) {
-              parseHstoreFields(self.callee, row);
-            });
           }
           }
+        });
 
 
-          return self.handleSelectQuery(rows);
-        }
+        return result;
       } else if (self.isShowOrDescribeQuery()) {
       } else if (self.isShowOrDescribeQuery()) {
         return results;
         return results;
       } else if (QueryTypes.BULKUPDATE === self.options.type) {
       } else if (QueryTypes.BULKUPDATE === self.options.type) {

lib/query-interface.js

@@ -46,12 +46,13 @@ module.exports = (function() {
     var self = this;
     var self = this;
 
 
     options = Utils._.extend({
     options = Utils._.extend({
-      raw: true
+      raw: true,
+      type: this.sequelize.QueryTypes.SELECT
     }, options || {});
     }, options || {});
 
 
     var showSchemasSql = self.QueryGenerator.showSchemasQuery();
     var showSchemasSql = self.QueryGenerator.showSchemasQuery();
 
 
-    return this.sequelize.query(showSchemasSql, null, options).then(function(schemaNames) {
+    return this.sequelize.query(showSchemasSql, options).then(function(schemaNames) {
       return Utils._.flatten(
       return Utils._.flatten(
         Utils._.map(schemaNames, function(value) {
         Utils._.map(schemaNames, function(value) {
           return (!!value.schema_name ? value.schema_name : value);
           return (!!value.schema_name ? value.schema_name : value);
@@ -317,7 +318,7 @@ module.exports = (function() {
 
 
     var sql = this.QueryGenerator.describeTableQuery(tableName, schema, schemaDelimiter);
     var sql = this.QueryGenerator.describeTableQuery(tableName, schema, schemaDelimiter);
 
 
-    return this.sequelize.query(sql, null, { raw: true }).then(function(data) {
+    return this.sequelize.query(sql, { type: QueryTypes.DESCRIBE }).then(function(data) {
       // If no data is returned from the query, then the table name may be wrong.
       // If no data is returned from the query, then the table name may be wrong.
       // Query generators that use information_schema for retrieving table info will just return an empty result set,
       // Query generators that use information_schema for retrieving table info will just return an empty result set,
       // it will not throw an error like built-ins do (e.g. DESCRIBE on MySql).
       // it will not throw an error like built-ins do (e.g. DESCRIBE on MySql).

lib/query-types.js

@@ -10,5 +10,6 @@ module.exports = {
   VERSION: 'VERSION',
   VERSION: 'VERSION',
   SHOWTABLES: 'SHOWTABLES',
   SHOWTABLES: 'SHOWTABLES',
   SHOWINDEXES: 'SHOWINDEXES',
   SHOWINDEXES: 'SHOWINDEXES',
+  DESCRIBE: 'DESCRIBE',
   RAW: 'RAW',
   RAW: 'RAW',
 };
 };