mssql 6.2.2 → 6.2.3

package/CHANGELOG.txt

@@ -1,3 +1,8 @@
+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))

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
 
@@ -658,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/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

@@ -396,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)
+              }
             }
           }
 
@@ -436,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 = {}
 
@@ -466,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)
+              }
+            }
           }
         })
 
@@ -525,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/package.json

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

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
+});