mssql 6.2.2 → 6.3.2

package/CHANGELOG.txt

@@ -1,3 +1,22 @@
+v6.3.2 (2021-05-13)
+-------------------
+[fix] Bump various dependencies for security fixes
+
+v6.3.1 (2021-01-01)
+-------------------
+[fix] Ensure line endings are unix style (LF)
+
+v6.3.0 (2020-12-14)
+-------------------
+[new] Result sets with duplicate keys can now be handled using `request.arrayRowMode` ([#1130](https://github.com/tediousjs/node-mssql/pull/1130))
+[fix] Issue with geography v2 parsing resolve ([#1138](https://github.com/tediousjs/node-mssql/pull/1138))
+[fix] Fixed issue where msnodesqlv8 could sometimes terminate queries before all errors has been emitted causing queries to hang ([#1145](https://github.com/tediousjs/node-mssql/pull/1145))
+
+v6.2.3 (2020-09-25)
+-------------------
+[fix] Remove reference to global pool on connection error ([#1107](https://github.com/tediousjs/node-mssql/pull/1107))
+[fix] Trailing rows from request streams using msnodesqlv8 driver fail to be emitted ([#1109](https://github.com/tediousjs/node-mssql/pull/1109))
+
 v6.2.2 (2020-09-18)
 -------------------
 [fix] Avoid using deprecated `.inspect` on Objects ([#1071](https://github.com/tediousjs/node-mssql/pull/1071))
@@ -48,6 +67,14 @@ v6.0.0 (2019-11-05)
 [change] Replaced pool library (`generic-pool`) with `tarn.js` ([#808](https://github.com/tediousjs/node-mssql/pull/808))
 [removed] Backoff try strategy for creating connections removed, `tarn.js` built-in retry strategy used instead
 
+v5.1.5 (2021-05-13)
+-------------------
+[fix] Bump various dependencies for security fixes
+
+v5.1.4 (2021-01-01)
+-------------------
+[fix] Ensure line endings are unix style (LF)
+
 v5.1.3 (2020-09-18)
 -------------------
 [fix] Avoid using deprecated `.inspect` on Objects ([#1071](https://github.com/tediousjs/node-mssql/pull/1071))

package/README.md

@@ -6,7 +6,7 @@ Microsoft SQL Server client for Node.js
 
 Supported TDS drivers:
 - [Tedious][tedious-url] (pure JavaScript - Windows/macOS/Linux, default)
-- [Microsoft / Contributors Node V8 Driver for Node.js for SQL Server][msnodesqlv8-url] (native - Windows only)
+- [Microsoft / Contributors Node V8 Driver for Node.js for SQL Server][msnodesqlv8-url] (v1 native - Windows only)
 
 ## Installation
 
@@ -96,6 +96,7 @@ Parts of the connection URI should be correctly URL encoded so that the URI can
 * [Table-Valued Parameter](#table-valued-parameter-tvp)
 * [Affected Rows](#affected-rows)
 * [JSON support](#json-support)
+* [Handling Duplicate Column Names](#handling-duplicate-column-names)
 * [Errors](#errors)
 * [Informational messages](#informational-messages)
 * [Metadata](#metadata)
@@ -611,6 +612,7 @@ const config = {
 - **pool.max** - The maximum number of connections there can be in the pool (default: `10`).
 - **pool.min** - The minimum of connections there can be in the pool (default: `0`).
 - **pool.idleTimeoutMillis** - The Number of milliseconds before closing an unused connection (default: `30000`).
+- **arrayRowMode** - Return row results as a an array instead of a keyed object. Also adds `columns` array. See [Handling Duplicate Column Names](#handling-duplicate-column-names)
 
 Complete list of pool options can be found [here](https://github.com/vincit/tarn.js/#usage).
 
@@ -658,7 +660,7 @@ More information about Tedious specific options: http://tediousjs.github.io/tedi
 
 ### Microsoft / Contributors Node V8 Driver for Node.js for SQL Server
 
-**Requires Node.js 0.12.x or newer. Windows only.** This driver is not part of the default package and must be installed separately by `npm install msnodesqlv8`. To use this driver, use this require syntax: `const sql = require('mssql/msnodesqlv8')`.
+**Requires Node.js v10+ or newer. Windows only.** This driver is not part of the default package and must be installed separately by `npm install msnodesqlv8@^1`. To use this driver, use this require syntax: `const sql = require('mssql/msnodesqlv8')`.
 
 **Extra options:**
 
@@ -1566,6 +1568,189 @@ recordset = [ { a: { b: { c: 1, d: 2 }, x: 3, y: 4 } } ]
 
 More information about JSON support can be found in [official documentation](https://msdn.microsoft.com/en-us/library/dn921882.aspx).
 
+## Handling Duplicate Column Names
+
+If your queries contain output columns with identical names, the default behaviour of `mssql` will only return column metadata for the last column with that name. You will also not always be able to re-assemble the order of output columns requested. 
+
+Default behaviour:
+```javascript
+const request = new sql.Request()
+request
+    .query("select 'asdf' as name, 'qwerty' as other_name, 'jkl' as name")
+    .then(result => {
+        console.log(result)
+    });
+```
+Results in:
+```javascript
+{
+  recordsets: [
+    [ { name: [ 'asdf', 'jkl' ], other_name: 'qwerty' } ]
+  ],
+  recordset: [ { name: [ 'asdf', 'jkl' ], other_name: 'qwerty' } ],
+  output: {},
+  rowsAffected: [ 1 ]
+}
+```
+
+You can use the `arrayRowMode` configuration parameter to return the row values as arrays and add a separate array of column values. `arrayRowMode` can be set globally during the initial connection, or per-request.
+
+```javascript
+const request = new sql.Request()
+request.arrayRowMode = true
+request
+    .query("select 'asdf' as name, 'qwerty' as other_name, 'jkl' as name")
+    .then(result => {
+        console.log(result)
+    });
+```
+
+Results in:
+```javascript
+{
+  recordsets: [ [ [ 'asdf', 'qwerty', 'jkl' ] ] ],
+  recordset: [ [ 'asdf', 'qwerty', 'jkl' ] ],
+  output: {},
+  rowsAffected: [ 1 ],
+  columns: [
+    [
+      {
+        index: 0,
+        name: 'name',
+        length: 4,
+        type: [sql.VarChar],
+        scale: undefined,
+        precision: undefined,
+        nullable: false,
+        caseSensitive: false,
+        identity: false,
+        readOnly: true
+      },
+      {
+        index: 1,
+        name: 'other_name',
+        length: 6,
+        type: [sql.VarChar],
+        scale: undefined,
+        precision: undefined,
+        nullable: false,
+        caseSensitive: false,
+        identity: false,
+        readOnly: true
+      },
+      {
+        index: 2,
+        name: 'name',
+        length: 3,
+        type: [sql.VarChar],
+        scale: undefined,
+        precision: undefined,
+        nullable: false,
+        caseSensitive: false,
+        identity: false,
+        readOnly: true
+      }
+    ]
+  ]
+}
+```
+
+__Streaming Duplicate Column Names__
+
+When using `arrayRowMode` with `stream` enabled, the output from the `recordset` event (as described in [Streaming](#streaming)) is returned as an array of column metadata, instead of as a keyed object. The order of the column metadata provided by the `recordset` event will match the order of row values when `arrayRowMode` is enabled.
+
+Default behaviour (without `arrayRowMode`):
+```javascript
+const request = new sql.Request()
+request.stream = true
+request.query("select 'asdf' as name, 'qwerty' as other_name, 'jkl' as name")
+request.on('recordset', recordset => console.log(recordset))
+```
+
+
+Results in:
+
+```javascript
+{
+  name: {
+    index: 2,
+    name: 'name',
+    length: 3,
+    type: [sql.VarChar],
+    scale: undefined,
+    precision: undefined,
+    nullable: false,
+    caseSensitive: false,
+    identity: false,
+    readOnly: true
+  },
+  other_name: {
+    index: 1,
+    name: 'other_name',
+    length: 6,
+    type: [sql.VarChar],
+    scale: undefined,
+    precision: undefined,
+    nullable: false,
+    caseSensitive: false,
+    identity: false,
+    readOnly: true
+  }
+}
+```
+
+With `arrayRowMode`:
+```javascript
+const request = new sql.Request()
+request.stream = true
+request.arrayRowMode = true
+request.query("select 'asdf' as name, 'qwerty' as other_name, 'jkl' as name")
+
+request.on('recordset', recordset => console.log(recordset))
+```
+
+Results in:
+```javascript
+[
+  {
+    index: 0,
+    name: 'name',
+    length: 4,
+    type: [sql.VarChar],
+    scale: undefined,
+    precision: undefined,
+    nullable: false,
+    caseSensitive: false,
+    identity: false,
+    readOnly: true
+  },
+  {
+    index: 1,
+    name: 'other_name',
+    length: 6,
+    type: [sql.VarChar],
+    scale: undefined,
+    precision: undefined,
+    nullable: false,
+    caseSensitive: false,
+    identity: false,
+    readOnly: true
+  },
+  {
+    index: 2,
+    name: 'name',
+    length: 3,
+    type: [sql.VarChar],
+    scale: undefined,
+    precision: undefined,
+    nullable: false,
+    caseSensitive: false,
+    identity: false,
+    readOnly: true
+  }
+]
+```
+
 ## Errors
 
 There are 4 types of errors you can handle:

package/lib/base/connection-pool.js

@@ -59,6 +59,7 @@ class ConnectionPool extends EventEmitter {
     this.config.options = this.config.options || {}
     this.config.stream = this.config.stream || false
     this.config.parseJSON = this.config.parseJSON || false
+    this.config.arrayRowMode = this.config.arrayRowMode || false
 
     if (/^(.*)\\(.*)$/.exec(this.config.server)) {
       this.config.server = RegExp.$1

package/lib/base/prepared-statement.js

@@ -292,6 +292,7 @@ class PreparedStatement extends EventEmitter {
   _execute (values, callback) {
     const req = new shared.driver.Request(this)
     req.stream = this.stream
+    req.arrayRowMode = this.arrayRowMode
     req.input('handle', TYPES.Int, this._handle)
 
     // copy parameters with new values

package/lib/base/request.js

@@ -224,6 +224,7 @@ class Request extends EventEmitter {
 
   batch (batch, callback) {
     if (this.stream == null && this.connection) this.stream = this.connection.config.stream
+    if (this.arrayRowMode == null && this.connection) this.arrayRowMode = this.connection.config.arrayRowMode
     this.rowsAffected = 0
 
     if (typeof callback === 'function') {
@@ -316,6 +317,7 @@ class Request extends EventEmitter {
     }
 
     if (this.stream == null && this.connection) this.stream = this.connection.config.stream
+    if (this.arrayRowMode == null && this.connection) this.arrayRowMode = this.connection.config.arrayRowMode
 
     if (this.stream || typeof callback === 'function') {
       this._bulk(table, options, (err, rowsAffected) => {
@@ -392,10 +394,11 @@ class Request extends EventEmitter {
 
   query (command, callback) {
     if (this.stream == null && this.connection) this.stream = this.connection.config.stream
+    if (this.arrayRowMode == null && this.connection) this.arrayRowMode = this.connection.config.arrayRowMode
     this.rowsAffected = 0
 
     if (typeof callback === 'function') {
-      this._query(command, (err, recordsets, output, rowsAffected) => {
+      this._query(command, (err, recordsets, output, rowsAffected, columns) => {
         if (this.stream) {
           if (err) this.emit('error', err)
           err = null
@@ -407,12 +410,14 @@ class Request extends EventEmitter {
         }
 
         if (err) return callback(err)
-        callback(null, {
+        const result = {
           recordsets,
           recordset: recordsets && recordsets[0],
           output,
           rowsAffected
-        })
+        }
+        if (this.arrayRowMode) result.columns = columns
+        callback(null, result)
       })
       return this
     }
@@ -425,7 +430,7 @@ class Request extends EventEmitter {
     }
 
     return new shared.Promise((resolve, reject) => {
-      this._query(command, (err, recordsets, output, rowsAffected) => {
+      this._query(command, (err, recordsets, output, rowsAffected, columns) => {
         if (this.stream) {
           if (err) this.emit('error', err)
           err = null
@@ -437,12 +442,14 @@ class Request extends EventEmitter {
         }
 
         if (err) return reject(err)
-        resolve({
+        const result = {
           recordsets,
           recordset: recordsets && recordsets[0],
           output,
           rowsAffected
-        })
+        }
+        if (this.arrayRowMode) result.columns = columns
+        resolve(result)
       })
     })
   }
@@ -476,10 +483,11 @@ class Request extends EventEmitter {
 
   execute (command, callback) {
     if (this.stream == null && this.connection) this.stream = this.connection.config.stream
+    if (this.arrayRowMode == null && this.connection) this.arrayRowMode = this.connection.config.arrayRowMode
     this.rowsAffected = 0
 
     if (typeof callback === 'function') {
-      this._execute(command, (err, recordsets, output, returnValue, rowsAffected) => {
+      this._execute(command, (err, recordsets, output, returnValue, rowsAffected, columns) => {
         if (this.stream) {
           if (err) this.emit('error', err)
           err = null
@@ -492,19 +500,21 @@ class Request extends EventEmitter {
         }
 
         if (err) return callback(err)
-        callback(null, {
+        const result = {
           recordsets,
           recordset: recordsets && recordsets[0],
           output,
           rowsAffected,
           returnValue
-        })
+        }
+        if (this.arrayRowMode) result.columns = columns
+        callback(null, result)
       })
       return this
     }
 
     return new shared.Promise((resolve, reject) => {
-      this._execute(command, (err, recordsets, output, returnValue, rowsAffected) => {
+      this._execute(command, (err, recordsets, output, returnValue, rowsAffected, columns) => {
         if (this.stream) {
           if (err) this.emit('error', err)
           err = null
@@ -517,13 +527,15 @@ class Request extends EventEmitter {
         }
 
         if (err) return reject(err)
-        resolve({
+        const result = {
           recordsets,
           recordset: recordsets && recordsets[0],
           output,
           rowsAffected,
           returnValue
-        })
+        }
+        if (this.arrayRowMode) result.columns = columns
+        resolve(result)
       })
     })
   }

package/lib/global-connection.js

@@ -48,7 +48,18 @@ function connect (config, callback) {
 
     globalConnection.close = globalClose.bind(globalConnection)
   }
-  return globalConnection.connect(callback)
+  if (typeof callback === 'function') {
+    return globalConnection.connect((err, connection) => {
+      if (err) {
+        globalConnection = null
+      }
+      callback(err, connection)
+    })
+  }
+  return globalConnection.connect().catch((err) => {
+    globalConnection = null
+    return shared.Promise.reject(err)
+  })
 }
 
 /**

package/lib/msnodesqlv8/request.js

@@ -88,11 +88,13 @@ const castParameter = function (value, type) {
   return value
 }
 
-const createColumns = function (metadata) {
-  const out = {}
+const createColumns = function (metadata, arrayRowMode) {
+  let out = {}
+  if (arrayRowMode) out = []
   for (let index = 0, length = metadata.length; index < length; index++) {
     const column = metadata[index]
-    out[column.name] = {
+    const colName = column.name
+    const outColumn = {
       index,
       name: column.name,
       length: column.size,
@@ -101,14 +103,19 @@ const createColumns = function (metadata) {
     }
 
     if (column.udtType != null) {
-      out[column.name].udt = {
+      outColumn.udt = {
         name: column.udtType
       }
 
       if (DECLARATIONS[column.udtType]) {
-        out[column.name].type = DECLARATIONS[column.udtType]
+        outColumn.type = DECLARATIONS[column.udtType]
       }
     }
+    if (arrayRowMode) {
+      out.push(outColumn)
+    } else {
+      out[colName] = outColumn
+    }
   }
 
   return out
@@ -236,6 +243,7 @@ class Request extends BaseRequest {
       }
 
       const recordsets = []
+      const recordsetcolumns = []
       const errors = []
       const errorHandlers = {}
       const output = {}
@@ -396,11 +404,10 @@ class Request extends BaseRequest {
               }
 
               chunksBuffer = null
-            }
-
-            if (row && row.___return___ == null) {
-              // row with ___return___ col is the last row
-              if (this.stream && !this.paused) this.emit('row', row)
+              if (row && row.___return___ == null) {
+                // row with ___return___ col is the last row
+                if (this.stream && !this.paused) this.emit('row', row)
+              }
             }
           }
 
@@ -411,7 +418,7 @@ class Request extends BaseRequest {
           Object.defineProperty(recordset, 'columns', {
             enumerable: false,
             configurable: true,
-            value: createColumns(metadata)
+            value: createColumns(metadata, this.arrayRowMode)
           })
 
           Object.defineProperty(recordset, 'toTable', {
@@ -426,27 +433,36 @@ class Request extends BaseRequest {
             chunksBuffer = []
           }
 
+          let hasReturnColumn = false
+          if (recordset.columns.___return___ != null) {
+            hasReturnColumn = true
+          } else if (this.arrayRowMode) {
+            for (let i = 0; i < columns.length; i++) {
+              if (columns[i].name === '___return___') {
+                hasReturnColumn = true
+                break
+              }
+            }
+          }
           if (this.stream) {
-            if (recordset.columns.___return___ == null) {
+            if (!hasReturnColumn) {
               this.emit('recordset', recordset.columns)
             }
           } else {
             recordsets.push(recordset)
           }
+          if (this.arrayRowMode) recordsetcolumns.push(recordset.columns)
         })
 
         req.on('row', rownumber => {
-          if (row) {
-            if (isChunkedRecordset) return
+          if (row && isChunkedRecordset) return
 
-            if (row.___return___ == null) {
-              // row with ___return___ col is the last row
-              if (this.stream && !this.paused) this.emit('row', row)
-            }
+          if (this.arrayRowMode) {
+            row = []
+          } else {
+            row = {}
           }
 
-          row = {}
-
           if (!this.stream) recordset.push(row)
         })
 
@@ -456,15 +472,35 @@ class Request extends BaseRequest {
           } else {
             data = valueCorrection(data, columns[idx])
 
-            const exi = row[columns[idx].name]
-            if (exi != null) {
-              if (exi instanceof Array) {
-                exi.push(data)
+            if (this.arrayRowMode) {
+              row.push(data)
+            } else {
+              const exi = row[columns[idx].name]
+              if (exi != null) {
+                if (exi instanceof Array) {
+                  exi.push(data)
+                } else {
+                  row[columns[idx].name] = [exi, data]
+                }
               } else {
-                row[columns[idx].name] = [exi, data]
+                row[columns[idx].name] = data
+              }
+            }
+            let hasReturnColumn = false
+            if (row && row.___return___ != null) {
+              hasReturnColumn = true
+            } else if (this.arrayRowMode) {
+              for (let i = 0; i < columns.length; i++) {
+                if (columns[i].name === '___return___') {
+                  hasReturnColumn = true
+                  break
+                }
+              }
+            }
+            if (!hasReturnColumn) {
+              if (this.stream && !this.paused && idx === columns.length - 1) {
+                this.emit('row', row)
               }
-            } else {
-              row[columns[idx].name] = data
             }
           }
         })
@@ -487,6 +523,14 @@ class Request extends BaseRequest {
             serverName: msg.serverName,
             procName: msg.procName
           })
+
+          // query terminated
+          if (msg.code === 3621 && !hasReturned) {
+            // if the query has been terminated it's probably best to throw the last meaningful error if there was one
+            // pop it off the errors array so it doesn't get put in twice
+            const error = errors.length > 0 ? errors.pop() : msg
+            handleError(req, connection, error.originalError || error, false)
+          }
         })
 
         req.on('error', errorHandlers.error = handleError.bind(null, req, connection))
@@ -525,11 +569,10 @@ class Request extends BaseRequest {
                 }
 
                 chunksBuffer = null
-              }
-
-              if (row && row.___return___ == null) {
-                // row with ___return___ col is the last row
-                if (this.stream && !this.paused) { this.emit('row', row) }
+                if (row && row.___return___ == null) {
+                  // row with ___return___ col is the last row
+                  if (this.stream && !this.paused) { this.emit('row', row) }
+                }
               }
             }
 
@@ -555,9 +598,9 @@ class Request extends BaseRequest {
           debug('request(%d): completed', IDS.get(this))
 
           if (this.stream) {
-            callback(null, this._nested ? row : null, output, rowsAffected)
+            callback(null, this._nested ? row : null, output, rowsAffected, recordsetcolumns)
           } else {
-            callback(null, recordsets, output, rowsAffected)
+            callback(null, recordsets, output, rowsAffected, recordsetcolumns)
           }
         })
       })
@@ -614,7 +657,7 @@ class Request extends BaseRequest {
 
       this._nested = true
 
-      this._query(cmd, (err, recordsets, output, rowsAffected) => {
+      this._query(cmd, (err, recordsets, output, rowsAffected, recordsetcolumns) => {
         this._nested = false
 
         if (err) return callback(err)
@@ -626,25 +669,49 @@ class Request extends BaseRequest {
           last = recordsets.pop()
           if (last) last = last[0]
         }
-
-        if (last && (last.___return___ != null)) {
-          returnValue = last.___return___
-
-          for (const name in this.parameters) {
-            if (!objectHasProperty(this.parameters, name)) {
+        const lastColumns = recordsetcolumns.pop()
+
+        if (last && this.arrayRowMode && lastColumns) {
+          let returnColumnIdx = null
+          const parametersNameToLastIdxDict = {}
+          for (let i = 0; i < lastColumns.length; i++) {
+            if (lastColumns[i].name === '___return___') {
+              returnColumnIdx = i
+            } else if (objectHasProperty(this.parameters, lastColumns[i].name)) {
+              parametersNameToLastIdxDict[lastColumns[i].name] = i
+            }
+          }
+          if (returnColumnIdx != null) {
+            returnValue = last[returnColumnIdx]
+          }
+          for (const name in parametersNameToLastIdxDict) {
+            if (!objectHasProperty(parametersNameToLastIdxDict, name)) {
               continue
             }
             const param = this.parameters[name]
             if (param.io === 2) {
-              output[param.name] = last[param.name]
+              output[param.name] = last[parametersNameToLastIdxDict[name]]
             }
           }
-        }
+        } else {
+          if (last && (last.___return___ != null)) {
+            returnValue = last.___return___
 
+            for (const name in this.parameters) {
+              if (!objectHasProperty(this.parameters, name)) {
+                continue
+              }
+              const param = this.parameters[name]
+              if (param.io === 2) {
+                output[param.name] = last[param.name]
+              }
+            }
+          }
+        }
         if (this.stream) {
-          callback(null, null, output, returnValue, rowsAffected)
+          callback(null, null, output, returnValue, rowsAffected, recordsetcolumns)
         } else {
-          callback(null, recordsets, output, returnValue, rowsAffected)
+          callback(null, recordsets, output, returnValue, rowsAffected, recordsetcolumns)
         }
       })
     })

package/lib/tedious/request.js

@@ -117,11 +117,12 @@ const getMssqlType = function (type, length) {
   }
 }
 
-const createColumns = function (metadata) {
-  const out = {}
+const createColumns = function (metadata, arrayRowMode) {
+  let out = {}
+  if (arrayRowMode) out = []
   for (let index = 0, length = metadata.length; index < length; index++) {
     const column = metadata[index]
-    out[column.colName] = {
+    const outColumn = {
       index,
       name: column.colName,
       length: column.dataLength,
@@ -135,7 +136,7 @@ const createColumns = function (metadata) {
     }
 
     if (column.udtInfo) {
-      out[column.colName].udt = {
+      outColumn.udt = {
         name: column.udtInfo.typeName,
         database: column.udtInfo.dbname,
         schema: column.udtInfo.owningSchema,
@@ -143,9 +144,15 @@ const createColumns = function (metadata) {
       }
 
       if (DECLARATIONS[column.udtInfo.typeName]) {
-        out[column.colName].type = DECLARATIONS[column.udtInfo.typeName]
+        outColumn.type = DECLARATIONS[column.udtInfo.typeName]
       }
     }
+
+    if (arrayRowMode) {
+      out.push(outColumn)
+    } else {
+      out[column.colName] = outColumn
+    }
   }
 
   return out
@@ -347,6 +354,7 @@ class Request extends BaseRequest {
       if (err) return callback(err)
 
       const recordsets = []
+      const recordsetcolumns = []
       const errors = []
       const errorHandlers = {}
       const output = {}
@@ -466,9 +474,9 @@ class Request extends BaseRequest {
             }
 
             if (this.stream) {
-              callback(null, null, output, rowsAffected)
+              callback(null, null, output, rowsAffected, recordsetcolumns)
             } else {
-              callback(error, recordsets, output, rowsAffected)
+              callback(error, recordsets, output, rowsAffected, recordsetcolumns)
             }
           }
         })
@@ -476,7 +484,7 @@ class Request extends BaseRequest {
         this._setCurrentRequest(req)
 
         req.on('columnMetadata', metadata => {
-          columns = createColumns(metadata)
+          columns = createColumns(metadata, this.arrayRowMode)
 
           isChunkedRecordset = false
           if (metadata.length === 1 && (metadata[0].colName === JSON_COLUMN_ID || metadata[0].colName === XML_COLUMN_ID)) {
@@ -494,6 +502,7 @@ class Request extends BaseRequest {
               this.emit('recordset', columns)
             }
           }
+          if (this.arrayRowMode) recordsetcolumns.push(columns)
         })
 
         const doneHandler = (rowCount, more) => {
@@ -568,19 +577,27 @@ class Request extends BaseRequest {
             return chunksBuffer.push(columns[0].value)
           }
 
-          row = {}
+          if (this.arrayRowMode) {
+            row = []
+          } else {
+            row = {}
+          }
           for (const col of columns) {
             col.value = valueCorrection(col.value, col.metadata)
 
-            const exi = row[col.metadata.colName]
-            if (exi != null) {
-              if (exi instanceof Array) {
-                exi.push(col.value)
+            if (this.arrayRowMode) {
+              row.push(col.value)
+            } else {
+              const exi = row[col.metadata.colName]
+              if (exi != null) {
+                if (exi instanceof Array) {
+                  exi.push(col.value)
+                } else {
+                  row[col.metadata.colName] = [exi, col.value]
+                }
               } else {
-                row[col.metadata.colName] = [exi, col.value]
+                row[col.metadata.colName] = col.value
               }
-            } else {
-              row[col.metadata.colName] = col.value
             }
           }
 
@@ -684,6 +701,7 @@ class Request extends BaseRequest {
       if (err) return callback(err)
 
       const recordsets = []
+      const recordsetcolumns = []
       const errors = []
       const errorHandlers = {}
       const output = {}
@@ -800,9 +818,9 @@ class Request extends BaseRequest {
             }
 
             if (this.stream) {
-              callback(null, null, output, returnValue, rowsAffected)
+              callback(null, null, output, returnValue, rowsAffected, recordsetcolumns)
             } else {
-              callback(error, recordsets, output, returnValue, rowsAffected)
+              callback(error, recordsets, output, returnValue, rowsAffected, recordsetcolumns)
             }
           }
         })
@@ -810,7 +828,7 @@ class Request extends BaseRequest {
         this._setCurrentRequest(req)
 
         req.on('columnMetadata', metadata => {
-          columns = createColumns(metadata)
+          columns = createColumns(metadata, this.arrayRowMode)
 
           isChunkedRecordset = false
           if ((metadata.length === 1) && (metadata[0].colName === JSON_COLUMN_ID || metadata[0].colName === XML_COLUMN_ID)) {
@@ -819,6 +837,7 @@ class Request extends BaseRequest {
           }
 
           if (this.stream) this.emit('recordset', columns)
+          if (this.arrayRowMode) recordsetcolumns.push(columns)
         })
 
         req.on('row', columns => {
@@ -828,19 +847,27 @@ class Request extends BaseRequest {
             return chunksBuffer.push(columns[0].value)
           }
 
-          row = {}
+          if (this.arrayRowMode) {
+            row = []
+          } else {
+            row = {}
+          }
           for (const col of columns) {
             col.value = valueCorrection(col.value, col.metadata)
 
-            const exi = row[col.metadata.colName]
-            if (exi != null) {
-              if (exi instanceof Array) {
-                exi.push(col.value)
+            if (this.arrayRowMode) {
+              row.push(col.value)
+            } else {
+              const exi = row[col.metadata.colName]
+              if (exi != null) {
+                if (exi instanceof Array) {
+                  exi.push(col.value)
+                } else {
+                  row[col.metadata.colName] = [exi, col.value]
+                }
               } else {
-                row[col.metadata.colName] = [exi, col.value]
+                row[col.metadata.colName] = col.value
               }
-            } else {
-              row[col.metadata.colName] = col.value
             }
           }
 

package/lib/udt.js

@@ -271,7 +271,7 @@ const parseGeography = buffer => {
 
   // console.log( "shapes", shapes)
 
-  if (value.version === 2) {
+  if (value.version === 2 && buffer.position < buffer.length) {
     const numberOfSegments = buffer.readUInt32LE(buffer.position)
     buffer.position += 4
 

package/package.json

@@ -21,18 +21,18 @@
     "azure",
     "node-mssql"
   ],
-  "version": "6.2.2",
+  "version": "6.3.2",
   "main": "index.js",
   "repository": "github:tediousjs/node-mssql",
   "license": "MIT",
   "dependencies": {
-    "debug": "^4",
+    "debug": "^4.3.1",
     "tarn": "^1.1.5",
-    "tedious": "^6.6.2"
+    "tedious": "^6.7.0"
   },
   "devDependencies": {
-    "mocha": "^6.2.2",
-    "standard": "^14"
+    "mocha": "^6.2.3",
+    "standard": "^14.3.4"
   },
   "engines": {
     "node": ">=6"

package/test.js

@@ -1,13 +1,14 @@
 'use strict'
 
 const mssql = require('./')
+const wtf = require('wtfnode');
 
 const sqlConfig = {
-  password: 'P@ssw0rd',
+  password: '&r8wrucH',
   database: 'StockDB',
   stream: false,
   options: {
-    trustServerCertificate: true,
+    // trustServerCertificate: true,
     enableArithAbort: true,
     encrypt: true,
     abortTransactionOnError: false,
@@ -17,27 +18,23 @@ const sqlConfig = {
     min: 0,
   },
   port: 1433,
-  user: 'sa',
-  server: 'localhost',
+  user: 'dhensby',
+  server: '4sa.database.windows.net',
 }
 
-const client = new mssql.ConnectionPool(sqlConfig)
+// Bad URI, connection timeouts, hangs process
+mssql.connect({ ...sqlConfig, port: 2345 }).catch(err => {
+  console.error(err.message);
+  console.log('reconnecting...');
 
-async function run () {
-  try {
-    console.time('connect')
-    const pool = await client.connect()
-    console.timeEnd('connect')
-    const request = pool.request()
-    console.time('query')
-    await request.query('select 1')
-    console.timeEnd('query')
-    console.time('query')
-    await request.query('select 1')
-    console.timeEnd('query')
-  } finally {
-    await client.close()
-  }
-}
-
-run()
+  // Try to connect using the right URI
+  return mssql
+    .connect(sqlConfig)
+    .then(() => console.log('connected'))
+    .then(() => mssql.close())
+    .then(() => console.log('closed'))
+    .catch(err => {
+      console.error(err.message)
+      wtf.dump()
+    });  // <-- Fails here
+});