Added array row support.

Author: BufoViridis

Readme.md

@@ -212,6 +212,7 @@ issue [#501](https://github.com/mysqljs/mysql/issues/501). (Default: `false`)
   (insecure) authentication method. (Default: `false`)
 * `typeCast`: Determines if column values should be converted to native
    JavaScript types. (Default: `true`)
+* `arrayRow`: Determines if rows should be an array or an object. (Default: `false`)
 * `queryFormat`: A custom query format function. See [Custom format](#custom-format).
 * `supportBigNumbers`: When dealing with big numbers (BIGINT and DECIMAL columns) in the database,
   you should enable this option (Default: `false`).

lib/Connection.js

@@ -183,8 +183,16 @@ Connection.prototype.query = function query(sql, values, cb) {
   var query = Connection.createQuery(sql, values, cb);
   query._connection = this;
 
-  if (!(typeof sql === 'object' && 'typeCast' in sql)) {
+  if (typeof sql === 'object') {
+    if (!('typecast' in sql)) {
+      query.typeCast = this.config.typeCast;
+    }
+    if (!('arrayRow' in sql)) {
+      query.arrayRow = this.config.arrayRow;
+    }
+  } else {
     query.typeCast = this.config.typeCast;
+    query.arrayRow = this.config.arrayRow;
   }
 
   if (query.sql) {

lib/ConnectionConfig.js

@@ -37,6 +37,7 @@ function ConnectionConfig(options) {
   this.typeCast           = (options.typeCast === undefined)
     ? true
     : options.typeCast;
+  this.arrayRow = options.arrayRow || false;
 
   if (this.timezone[0] === ' ') {
     // "+" is a url encoded char for space so it

lib/Pool.js

@@ -190,8 +190,16 @@ Pool.prototype.end = function (cb) {
 Pool.prototype.query = function (sql, values, cb) {
   var query = Connection.createQuery(sql, values, cb);
 
-  if (!(typeof sql === 'object' && 'typeCast' in sql)) {
+  if (typeof sql === 'object') {
+    if (!('typecast' in sql)) {
+      query.typeCast = this.config.connectionConfig.typeCast;
+    }
+    if (!('arrayRow' in sql)) {
+      query.arrayRow = this.config.connectionConfig.arrayRow;
+    }
+  } else {
     query.typeCast = this.config.connectionConfig.typeCast;
+    query.arrayRow = this.config.connectionConfig.arrayRow;
   }
 
   if (this.config.connectionConfig.trace) {

lib/protocol/packets/RowDataPacket.js

@@ -13,6 +13,12 @@ Object.defineProperty(RowDataPacket.prototype, 'parse', {
   value        : parse
 });
 
+Object.defineProperty(RowDataPacket.prototype, 'parseAsArray', {
+  configurable : true,
+  enumerable   : false,
+  value        : parseAsArray
+});
+
 Object.defineProperty(RowDataPacket.prototype, '_typeCast', {
   configurable : true,
   enumerable   : false,
@@ -50,6 +56,28 @@ function parse(parser, fieldPackets, typeCast, nestTables, connection) {
   }
 }
 
+function parseAsArray(parser, fieldPackets, typeCast, connection) {
+  var self = this;
+  var next = function () {
+    return self._typeCast(fieldPacket, parser, connection.config.timezone, connection.config.supportBigNumbers, connection.config.bigNumberStrings, connection.config.dateStrings);
+  };
+  var row = [];
+  for (var i = 0; i < fieldPackets.length; i++) {
+    var fieldPacket = fieldPackets[i];
+
+    if (typeof typeCast === 'function') {
+      row[i] = typeCast.apply(connection, [ new Field({ packet: fieldPacket, parser: parser }), next ]);
+    } else {
+      row[i] = (typeCast)
+        ? this._typeCast(fieldPacket, parser, connection.config.timezone, connection.config.supportBigNumbers, connection.config.bigNumberStrings, connection.config.dateStrings)
+        : ( (fieldPacket.charsetNr === Charsets.BINARY)
+          ? parser.parseLengthCodedBuffer()
+          : parser.parseLengthCodedString() );
+    }
+  }
+  return row;
+}
+
 function typeCast(field, parser, timeZone, supportBigNumbers, bigNumberStrings, dateStrings) {
   var numberString;
 

lib/protocol/sequences/Query.js

@@ -140,12 +140,17 @@ Query.prototype._handleFinalResultPacket = function(packet) {
 };
 
 Query.prototype['RowDataPacket'] = function(packet, parser, connection) {
-  packet.parse(parser, this._resultSet.fieldPackets, this.typeCast, this.nestTables, connection);
-
+  var row;
+  if (this.arrayRow) {
+    row = packet.parseAsArray(parser, this._resultSet.fieldPackets, this.typeCast, connection);
+  } else {
+    packet.parse(parser, this._resultSet.fieldPackets, this.typeCast, this.nestTables, connection);
+    row = packet;
+  }
   if (this._callback) {
-    this._resultSet.rows.push(packet);
+    this._resultSet.rows.push(row);
   } else {
-    this.emit('result', packet, this._index);
+    this.emit('result', row, this._index);
   }
 };