mssql 6.1.0 → 6.2.3

package/CHANGELOG.txt

@@ -1,3 +1,32 @@
+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))
+[fix] Bump various dependencies for security fixes ([#1102](https://github.com/tediousjs/node-mssql/pull/1102))
+
+v6.2.1 (2020-07-22)
+-------------------
+[fix] Bump various dependencies for security fixes
+
+v6.2.0 (2020-03-13)
+-------------------
+[new] Set default isolationLevel for all transactions ([#1005](https://github.com/tediousjs/node-mssql/pull/1005))
+[new] sql.Date now is coerced into a date object ([#1007](https://github.com/tediousjs/node-mssql/pull/1007))
+[fix] Bump acorn dependency for security fix
+
+v6.1.0 (2020-02-17)
+-------------------
+[new] Add `Request.template` helper for providing templated strings to queries ([#960](https://github.com/tediousjs/node-mssql/pull/960))
+[new] Repeat calls to `ConnectionPool.connect()` resolve ([#941](https://github.com/tediousjs/node-mssql/pull/941))
+[new] Stored procedure params are now logged to debug log ([#979](https://github.com/tediousjs/node-mssql/pull/979))
+[fix] Repeat calls to `mssql.connect()` will now resolve correctly ([#986](https://github.com/tediousjs/node-mssql/pull/986))
+[fix] Connections are encrypted by default as documented ([#977](https://github.com/tediousjs/node-mssql/pull/977))
+[fix] Tagged template literal queries with empty array values now work ([#990](https://github.com/tediousjs/node-mssql/pull/990))
+
 v6.0.1 (2019-11-15)
 -------------------
 [fix] Fix an issue with connection strings where usernames have url encoded values ([#945](https://github.com/tediousjs/node-mssql/pull/945)
@@ -24,6 +53,19 @@ 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.3 (2020-09-18)
+-------------------
+[fix] Avoid using deprecated `.inspect` on Objects ([#1071](https://github.com/tediousjs/node-mssql/pull/1071))
+[fix] Bump various dependencies for security fixes ([#1102](https://github.com/tediousjs/node-mssql/pull/1102))
+
+v5.1.2 (2020-07-22)
+-------------------
+[fix] Bump various dependencies for security fixes
+
+v5.1.1 (2020-03-13)
+-------------------
+[fix] Bump acorn dependency for security fix
+
 v5.1.0 (2019-04-17)
 -------------------
 [new] Add readOnlyIntent to connection string parser ([#853](https://github.com/tediousjs/node-mssql/pull/853))
@@ -62,6 +104,14 @@ v5.0.0 (2019-03-07)
 [removed] Node.js < 6 is no longer supported
 [removed] Support dropped for deprecated tedious configuration values and types
 
+v4.3.9 (2020-07-22)
+-------------------
+[fix] Bump various dependencies for security fixes
+
+v4.3.8 (2020-03-13)
+-------------------
+[fix] Bump acorn dependency for security fix
+
 v4.3.7 (2019-03-29)
 -------------------
 [fix] Fix an issue where connections that error can deplete the pool ([#842](https://github.com/tediousjs/node-mssql/pull/842))
@@ -69,6 +119,7 @@ v4.3.7 (2019-03-29)
 v4.3.6 (2019-03-27)
 -------------------
 [fix] Fix a bug where msnodesqlv8 driver could execute callbacks twice ([#834](https://github.com/tediousjs/node-mssql/pull/834))
+[fix] Bump js-yaml dependency for security fix
 
 v4.3.5 (2019-03-09)
 -------------------

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] (native - Windows/Linux only)
 
 ## Installation
 
@@ -103,6 +103,7 @@ Parts of the connection URI should be correctly URL encoded so that the URI can
 * [SQL injection](#sql-injection)
 * [Known Issues](#known-issues)
 * [Contributing](https://github.com/tediousjs/node-mssql/wiki/Contributing)
+* [5.x to 6.x changes](#5x-to-6x-changes)
 * [4.x to 5.x changes](#4x-to-5x-changes)
 * [3.x to 4.x changes](#3x-to-4x-changes)
 * [3.x Documentation](https://github.com/tediousjs/node-mssql/blob/1893969195045a250f0fdeeb2de7f30dcf6689ad/README.md)
@@ -657,7 +658,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/Linux 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')`.
 
 **Extra options:**
 

package/lib/base/transaction.js

@@ -33,7 +33,7 @@ class Transaction extends EventEmitter {
     debug('transaction(%d): created', IDS.get(this))
 
     this.parent = parent || globalConnection.pool
-    this.isolationLevel = ISOLATION_LEVEL.READ_COMMITTED
+    this.isolationLevel = Transaction.defaultIsolationLevel
     this.name = ''
   }
 
@@ -251,4 +251,11 @@ class Transaction extends EventEmitter {
   }
 }
 
+/**
+ * Default isolation level used for any transactions that don't explicitly specify an isolation level.
+ *
+ * @type {number}
+ */
+Transaction.defaultIsolationLevel = ISOLATION_LEVEL.READ_COMMITTED
+
 module.exports = Transaction

package/lib/datatypes.js

@@ -1,5 +1,6 @@
 'use strict'
 const objectHasProperty = require('./utils').objectHasProperty
+const inspect = Symbol.for('nodejs.util.inspect.custom')
 
 const TYPES = {
   VarChar (length) {
@@ -125,7 +126,7 @@ for (const key in TYPES) {
     module.exports.DECLARATIONS[value.declaration] = value;
 
     ((key, value) => {
-      value.inspect = () => `[sql.${key}]`
+      value[inspect] = () => `[sql.${key}]`
     })(key, value)
   }
 }

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

@@ -96,7 +96,8 @@ const createColumns = function (metadata) {
       index,
       name: column.name,
       length: column.size,
-      type: DECLARATIONS[column.sqlType]
+      type: DECLARATIONS[column.sqlType],
+      nullable: column.nullable
     }
 
     if (column.udtType != null) {
@@ -234,16 +235,55 @@ class Request extends BaseRequest {
         return callback(null, [])
       }
 
-      let row = null
-      let columns = null
-      let recordset = null
       const recordsets = []
+      const errors = []
+      const errorHandlers = {}
       const output = {}
       const rowsAffected = []
+
+      let hasReturned = false
+      let row = null
+      let columns = null
+      let recordset = null
       let handleOutput = false
       let isChunkedRecordset = false
       let chunksBuffer = null
 
+      const handleError = (req, connection, info, moreErrors) => {
+        const doReturn = !moreErrors
+        if ((typeof info.sqlstate === 'string') && (info.sqlstate.toLowerCase() === '08s01')) {
+          connection.hasError = true
+        }
+
+        const err = new RequestError(info, 'EREQUEST')
+        err.code = 'EREQUEST'
+        err.state = info.sqlstate
+
+        if (this.stream) {
+          this.emit('error', err)
+        } else {
+          if (doReturn && !hasReturned) {
+            if (req) {
+              for (const event in errorHandlers) {
+                req.removeListener(event, errorHandlers[event])
+              }
+            }
+            if (connection) {
+              this.parent.release(connection)
+              delete this._cancel
+
+              debug('request(%d): failed', IDS.get(this), err)
+            }
+
+            hasReturned = true
+            callback(err)
+          }
+        }
+
+        // we must collect errors even in stream mode
+        errors.push(err)
+      }
+
       // nested = function is called by this.execute
 
       if (!this._nested) {
@@ -287,7 +327,6 @@ class Request extends BaseRequest {
 
       this.parent.acquire(this, (err, connection, config) => {
         if (err) return callback(err)
-        let hasReturned = false
 
         debug('connection(%d): borrowed to request #%d', IDS.get(connection), IDS.get(this))
 
@@ -357,11 +396,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)
+              }
             }
           }
 
@@ -397,14 +435,7 @@ class Request extends BaseRequest {
         })
 
         req.on('row', rownumber => {
-          if (row) {
-            if (isChunkedRecordset) return
-
-            if (row.___return___ == null) {
-              // row with ___return___ col is the last row
-              if (this.stream && !this.paused) this.emit('row', row)
-            }
-          }
+          if (row && isChunkedRecordset) return
 
           row = {}
 
@@ -427,6 +458,11 @@ class Request extends BaseRequest {
             } else {
               row[columns[idx].name] = data
             }
+            if (row.___return___ == null) {
+              if (this.stream && !this.paused && idx === columns.length - 1) {
+                this.emit('row', row)
+              }
+            }
           }
         })
 
@@ -450,26 +486,7 @@ class Request extends BaseRequest {
           })
         })
 
-        req.once('error', err => {
-          if (hasReturned) {
-            return
-          }
-          hasReturned = true
-
-          if ((typeof err.sqlstate === 'string') && (err.sqlstate.toLowerCase() === '08s01')) {
-            connection.hasError = true
-          }
-
-          err = new RequestError(err)
-          err.code = 'EREQUEST'
-          err.state = err.sqlstate
-
-          delete this._cancel
-          this.parent.release(connection)
-
-          debug('request(%d): failed', IDS.get(this), err)
-          callback(err)
-        })
+        req.on('error', errorHandlers.error = handleError.bind(null, req, connection))
 
         req.once('done', () => {
           if (hasReturned) {
@@ -505,11 +522,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) }
+                }
               }
             }
 

package/lib/table.js

@@ -30,17 +30,17 @@ function Table (name) {
       }
 
       options = options || {}
-      column.name = name
-      column.nullable = options.nullable
-      column.primary = options.primary
-      if (objectHasProperty(options, 'length')) {
-        column.length = options.length
-      }
+      column.name = name;
+
+      ['nullable', 'primary', 'identity', 'readOnly', 'length'].forEach(prop => {
+        if (objectHasProperty(options, prop)) {
+          column[prop] = options[prop]
+        }
+      })
 
       return this.push(column)
     }
-  }
-  )
+  })
 
   Object.defineProperty(this.rows, 'add', {
     value () {
@@ -58,6 +58,7 @@ Table.prototype._makeBulk = function _makeBulk () {
   for (let i = 0; i < this.columns.length; i++) {
     const col = this.columns[i]
     switch (col.type) {
+      case TYPES.Date:
       case TYPES.DateTime:
       case TYPES.DateTime2:
         for (let j = 0; j < this.rows.length; j++) {
@@ -125,7 +126,9 @@ Table.fromRecordset = function fromRecordset (recordset, name) {
         scale: col.scale,
         precision: col.precision
       }, {
-        nullable: col.nullable
+        nullable: col.nullable,
+        identity: col.identity,
+        readOnly: col.readOnly
       })
     }
   }

package/package.json

@@ -21,7 +21,7 @@
     "azure",
     "node-mssql"
   ],
-  "version": "6.1.0",
+  "version": "6.2.3",
   "main": "index.js",
   "repository": "github:tediousjs/node-mssql",
   "license": "MIT",

package/test.js

@@ -1,114 +1,40 @@
 'use strict'
 
 const mssql = require('./')
+const wtf = require('wtfnode');
 
 const sqlConfig = {
-  password: 'Upper_l0wercase',
-  database: 'di_production',
-  // connectionTimeout: undefined,
-  // requestTimeout: 30000,
+  password: '&r8wrucH',
+  database: 'StockDB',
   stream: false,
   options: {
+    // trustServerCertificate: true,
+    enableArithAbort: true,
     encrypt: true,
-    readOnlyIntent: true
+    abortTransactionOnError: false,
   },
-  port: 1433,
-  user: 'sa',
-  server: 'localhost',
   pool: {
-    // acquireTimeoutMillis: 1000,
-    // propagateCreateError: true,
+    max: 1,
+    min: 0,
   },
+  port: 1433,
+  user: 'dhensby',
+  server: '4sa.database.windows.net',
 }
 
-// let pool
-//
-// function createPool() {
-//   return new mssql.ConnectionPool(sqlConfig)
-// }
-//
-// const poolRequest = createPool()
-//
-// function connect () {
-//   console.log('trying to connect to server')
-//   // const poolRequest = createPool()
-//   mssql.on('error', (e) => {
-//     console.log('error event fired')
-//     console.error(e)
-//   })
-//   return poolRequest.connect(sqlConfig).then((connection) => {
-//     // setTimeout(connection.close.bind(connection), 2000)
-//     console.log('connection established')
-//     console.log(connection)
-//     connection.on('error', (e) => {
-//       console.log('on error')
-//       console.error(e)
-//     })
-//     pool = connection
-//   })
-// }
-//
-// function runQuery (result) {
-//   if (result) {
-//     console.log('*** RESULT ***')
-//     console.log(result.recordset)
-//     console.log('*** RESULT ***')
-//   }
-//   const request = pool.request();
-//   return new Promise((resolve) => {
-//     setTimeout(resolve, 10000)
-//   }).then(() => request.query('SELECT 1').catch(e => {
-//     console.log('query error')
-//     throw e
-//   })).then(runQuery)
-// }
-//
-// connect()
-//   .then(() => {
-//     return runQuery()
-//   })
-//   .catch((e) => {
-//     console.log('connection error')
-//     console.error(e)
-//     console.log(pool)
-//     return runQuery()
-//   })
-//   .then(() => {
-//     return pool && pool.close()
-//   }).catch(() => {
-//     console.log(pool)
-// })
-
-// const query = 'select 1';
-//
-// const quickExample = async () => {
-//   try {
-//     // make sure that any items are correctly URL encoded in the connection string
-//     await mssql.connect(sqlConfig)
-//     const result = await mssql.query(query);
-//     console.log('quickExample', result);
-//   } catch (err) {
-//     console.error('quickExample error:', err);
-//   }
-// }
-//
-// const func = quickExample
-//
-// const promises = [1, 2, 3, 4, 5, 6].map(index => func(index).catch(err => console.log(`err with index ${index}!`, err)));
+// Bad URI, connection timeouts, hangs process
+mssql.connect({ ...sqlConfig, port: 2345 }).catch(err => {
+  console.error(err.message);
+  console.log('reconnecting...');
 
-mssql.connect(sqlConfig)
-  .then(async (pool) => {
-    const query = 'SELECT [name] FROM [role] WHERE [idRole] = @id'
-    return pool.request().input('id', mssql.Int, 1).query(query)
-  })
-  .then((result) => {
-    console.log(result)
-  })
-  .then(() => {
-    return mssql.close()
-  })
-  .catch((err) => {
-    console.log('error handler')
-    console.error(err)
-    return mssql.close()
-  })
+  // 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
+});