mssql 8.1.3 → 8.1.4

package/CHANGELOG.txt

@@ -1,3 +1,7 @@
+v8.1.4 (2022-08-18)
+-------------------
+[fix] fix regression in requestTimout option not accepting `0` as a value ([#1421](https://github.com/tediousjs/node-mssql/pull/1421))
+
 v8.1.3 (2022-08-08)
 -------------------
 [fix] requestTimeout correctly resolved ([#1398](https://github.com/tediousjs/node-mssql/pull/1398))

package/LICENSE.md

@@ -1,22 +1,22 @@
-MIT License
-
-Copyright (c) 2013-2018 Patrik Simek and contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
+MIT License
+
+Copyright (c) 2013-2018 Patrik Simek and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

package/lib/isolationlevel.js

@@ -1,9 +1,9 @@
-'use strict'
-
-module.exports = {
-  READ_UNCOMMITTED: 0x01,
-  READ_COMMITTED: 0x02,
-  REPEATABLE_READ: 0x03,
-  SERIALIZABLE: 0x04,
-  SNAPSHOT: 0x05
-}
+'use strict'
+
+module.exports = {
+  READ_UNCOMMITTED: 0x01,
+  READ_COMMITTED: 0x02,
+  REPEATABLE_READ: 0x03,
+  SERIALIZABLE: 0x04,
+  SNAPSHOT: 0x05
+}

package/lib/msnodesqlv8/connection-pool.js

@@ -12,6 +12,14 @@ const CONNECTION_DRIVER = ['darwin', 'linux'].includes(platform()) ? 'ODBC Drive
 const CONNECTION_STRING_PORT = `Driver=${CONNECTION_DRIVER};Server=#{server},#{port};Database=#{database};Uid=#{user};Pwd=#{password};Trusted_Connection=#{trusted};Encrypt=#{encrypt};`
 const CONNECTION_STRING_NAMED_INSTANCE = `Driver=${CONNECTION_DRIVER};Server=#{server}\\#{instance};Database=#{database};Uid=#{user};Pwd=#{password};Trusted_Connection=#{trusted};Encrypt=#{encrypt};`
 
+function firstDefined () {
+  for (let i = 0; i < arguments.length; i++) {
+    if (typeof arguments[i] !== 'undefined') {
+      return arguments[i]
+    }
+  }
+}
+
 class ConnectionPool extends BaseConnectionPool {
   _poolCreate () {
     return new shared.Promise((resolve, reject) => {
@@ -21,11 +29,11 @@ class ConnectionPool extends BaseConnectionPool {
         defaultConnectionString = CONNECTION_STRING_NAMED_INSTANCE
       }
 
-      this.config.requestTimeout = this.config.requestTimeout || this.config.timeout || 15000
+      this.config.requestTimeout = firstDefined(this.config.requestTimeout, this.config.timeout, 15000)
 
       const cfg = {
         conn_str: this.config.connectionString || defaultConnectionString,
-        conn_timeout: (this.config.connectionTimeout || this.config.timeout || 15000) / 1000
+        conn_timeout: firstDefined(this.config.connectionTimeout, this.config.timeout, 15000) / 1000
       }
 
       cfg.conn_str = cfg.conn_str.replace(/#{([^}]*)}/g, (p) => {

package/lib/tedious/connection-pool.js

@@ -7,6 +7,14 @@ const { IDS } = require('../utils')
 const shared = require('../shared')
 const ConnectionError = require('../error/connection-error')
 
+function firstDefined () {
+  for (let i = 0; i < arguments.length; i++) {
+    if (typeof arguments[i] !== 'undefined') {
+      return arguments[i]
+    }
+  }
+}
+
 class ConnectionPool extends BaseConnectionPool {
   _poolCreate () {
     return new shared.Promise((resolve, reject) => {
@@ -36,8 +44,8 @@ class ConnectionPool extends BaseConnectionPool {
 
       cfg.options.database = cfg.options.database || this.config.database
       cfg.options.port = cfg.options.port || this.config.port
-      cfg.options.connectTimeout = cfg.options.connectTimeout || this.config.connectionTimeout || this.config.timeout || 15000
-      cfg.options.requestTimeout = cfg.options.requestTimeout || this.config.requestTimeout || this.config.timeout || 15000
+      cfg.options.connectTimeout = firstDefined(cfg.options.connectTimeout, this.config.connectionTimeout, this.config.timeout, 15000)
+      cfg.options.requestTimeout = firstDefined(cfg.options.requestTimeout, this.config.requestTimeout, this.config.timeout, 15000)
       cfg.options.tdsVersion = cfg.options.tdsVersion || '7_4'
       cfg.options.rowCollectionOnDone = cfg.options.rowCollectionOnDone || false
       cfg.options.rowCollectionOnRequestCompletion = cfg.options.rowCollectionOnRequestCompletion || false

package/package.json

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