mssql 4.0.4 → 4.1.0

package/CHANGELOG.txt

@@ -1,3 +1,10 @@
+v4.1.0 (2017-09-29)
+-------------------
+[new] Adding support for the MultiSubnetFailover option in connection strings (Paul Kehrer)
+[new] Add request timeout support for msnodesqlv8 queries (Michael Parque)
+[fix] Fix type inference of non-integer numbers (Andrew Crites)
+[fix] Set acquireTimeout on generic pool (Karl Wiggisser)
+
 v4.0.4 (2017-04-25)
 -------------------
 [fix] Fix auto-closing of idle connections

package/README.md

@@ -40,7 +40,7 @@ If you're on Windows Azure, add `?encrypt=true` to your connection string. See [
 
 ### Examples
 
-* [Async/Await](#async-await)
+* [Async/Await](#asyncawait)
 * [Promises](#promises)
 * [ES6 Tagged template literals](#es6-tagged-template-literals)
 * [Callbacks](#callbacks)
@@ -59,7 +59,7 @@ If you're on Windows Azure, add `?encrypt=true` to your connection string. See [
 
 ### Connections
 
-* [ConnectionPool](#connectionpool)
+* [ConnectionPool](#connections-1)
 * [connect](#connect-callback)
 * [close](#close)
 
@@ -189,7 +189,7 @@ sql.on('error', err => {
 
 Native Promise is used by default. You can easily change this with `sql.Promise = require('myownpromisepackage')`.
 
-**ES6 Tagged template literals**
+### ES6 Tagged template literals
 
 ```javascript
 const sql = require('mssql')
@@ -316,7 +316,7 @@ const pool2 = new sql.ConnectionPool(config, err => {
     })
 })
 
-pool1.on('error', err => {
+pool2.on('error', err => {
     // ... error handler
 })
 ```
@@ -360,7 +360,7 @@ const config = {
 - **domain** - Once you set domain, driver will connect to SQL Server using domain login.
 - **database** - Database to connect to (default: dependent on server configuration).
 - **connectionTimeout** - Connection timeout in ms (default: `15000`).
-- **requestTimeout** - Request timeout in ms (default: `15000`).
+- **requestTimeout** - Request timeout in ms (default: `15000`). NOTE: msnodesqlv8 driver doesn't support timeouts < 1 second.
 - **stream** - Stream recordsets/rows instead of returning them all at once as an argument of callback (default: `false`). You can also enable streaming for each request independently (`request.stream = true`). Always set to `true` if you plan to work with large amount of rows.
 - **parseJSON** - Parse JSON recordsets to JS objects (default: `false`). For more information please see section [JSON support](#json-support).
 - **pool.max** - The maximum number of connections there can be in the pool (default: `10`).
@@ -727,7 +727,7 @@ You can enable multiple recordsets in queries with the `request.multiple = true`
 
 ---------------------------------------
 
-### bulk(table, [callback])
+### bulk (table, [callback])
 
 Perform a bulk insert.
 

package/lib/base.js

@@ -66,14 +66,12 @@ let getTypeByValue = function (value) {
       return TYPES.NVarChar
 
     case 'number':
-      for (item of Array.from(map)) {
-        if (item.js === Number) {
-          return item.sql
-        }
+      if (value % 1 === 0) {
+        return TYPES.Int
+      } else {
+        return TYPES.Float
       }
 
-      return TYPES.Int
-
     case 'boolean':
       for (item of Array.from(map)) {
         if (item.js === Boolean) {
@@ -253,6 +251,7 @@ class ConnectionPool extends EventEmitter {
       }, Object.assign({
         max: 10,
         min: 0,
+        acquireTimeoutMillis: this.config.connectionTimeout || this.config.timeout || 15000,
         evictionRunIntervalMillis: 1000,
         idleTimeoutMillis: 30000,
         testOnBorrow: true
@@ -1558,7 +1557,8 @@ module.exports = {
     ISOLATION_LEVEL,
     TYPES,
     MAX: 65535, // (1 << 16) - 1
-    map
+    map,
+    getTypeByValue
   }
 }
 

package/lib/connectionstring.js

@@ -75,7 +75,7 @@ const parseConnectionString = function (string) {
   const parsed = {}
   const original = {}
 
-  Object.defineProperty(parsed, '__original__', {value: original})
+  Object.defineProperty(parsed, '__original__', { value: original })
   Object.defineProperty(parsed, 'toString', {
     value () {
       const out = []
@@ -96,7 +96,7 @@ const parseConnectionString = function (string) {
         if (parsing === 'name') {
           buffer = buffer.trim()
           param = buffer.toLowerCase()
-          original[param] = {name: buffer}
+          original[param] = { name: buffer }
           parsing = 'value'
           buffer = ''
         } else {
@@ -210,10 +210,10 @@ const resolveConnectionString = function (string, driver) {
     parsed.driver = 'SQL Server Native Client 11.0'
 
     if (parsed.__original__) {
-      parsed.__original__.driver = {name: 'Driver', escape: ['{', '}']}
+      parsed.__original__.driver = { name: 'Driver', escape: ['{', '}'] }
     }
 
-    return {connectionString: parsed.toString()}
+    return { connectionString: parsed.toString() }
   }
 
   let user = parsed.uid || parsed.uid || parsed['user id']
@@ -241,6 +241,10 @@ const resolveConnectionString = function (string, driver) {
     config.requestTimeout = parseInt(config.requestTimeout, 10)
   }
 
+  if (parsed.multisubnetfailover != null) {
+    config.options.multiSubnetFailover = parsed.multisubnetfailover.toLowerCase() === 'true'
+  }
+
   if (/^(.*)\\(.*)$/.exec(user)) {
     config.domain = RegExp.$1
     user = RegExp.$2

package/lib/msnodesqlv8.js

@@ -151,6 +151,10 @@ class ConnectionPool extends base.ConnectionPool {
         defaultConnectionString = CONNECTION_STRING_NAMED_INSTANCE
       }
 
+      if (this.config.requestTimeout == null) {
+        this.config.requestTimeout = 15000
+      }
+
       const cfg = {
         conn_str: this.config.connectionString || defaultConnectionString,
         conn_timeout: (this.config.connectionTimeout || 15000) / 1000
@@ -423,7 +427,10 @@ class Request extends base.Request {
           }
         }
 
-        const req = connection.queryRaw(command, params)
+        const req = connection.queryRaw({
+          query_str: command,
+          query_timeout: config.requestTimeout / 1000  // msnodesqlv8 timeouts are in seconds (<1 second not supported)
+        }, params)
         req.on('meta', metadata => {
           if (row) {
             if (isChunkedRecordset) {

package/package.json

@@ -21,7 +21,7 @@
     "azure",
     "node-mssql"
   ],
-  "version": "4.0.4",
+  "version": "4.1.0",
   "main": "index.js",
   "repository": {
     "type": "git",

package/.npmignore

@@ -1,4 +0,0 @@
-node_modules
-.DS_Store
-.vscode
-test