mssql 8.1.2 → 8.1.3

package/CHANGELOG.txt

@@ -1,3 +1,8 @@
+v8.1.3 (2022-08-08)
+-------------------
+[fix] requestTimeout correctly resolved ([#1398](https://github.com/tediousjs/node-mssql/pull/1398))
+[fix] Forcibly deny use of `useColumnNames` tedious config option that can be passed in the config object ([#1416](https://github.com/tediousjs/node-mssql/pull/1416))
+
 v8.1.2 (2022-05-27)
 -------------------
 [fix] quote identifiers in table constraint declaration ([#1397](https://github.com/tediousjs/node-mssql/pull/1397))

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/base/connection-pool.js

@@ -8,6 +8,7 @@ const { IDS } = require('../utils')
 const ConnectionError = require('../error/connection-error')
 const shared = require('../shared')
 const clone = require('rfdc/default')
+const { MSSQLError } = require('../error')
 
 /**
  * Class ConnectionPool.
@@ -68,6 +69,14 @@ class ConnectionPool extends EventEmitter {
       this.config.options.instanceName = RegExp.$2
     }
 
+    if (typeof this.config.options.useColumnNames !== 'undefined' && this.config.options.useColumnNames !== true) {
+      const ex = new MSSQLError('Invalid options `useColumnNames`, use `arrayRowMode` instead')
+      if (typeof callback === 'function') {
+        return setImmediate(callback, ex)
+      }
+      throw ex
+    }
+
     if (typeof callback === 'function') {
       this.connect(callback)
     }

package/lib/base/request.js

@@ -48,7 +48,7 @@ class Request extends EventEmitter {
   }
 
   /**
-   * Generate sql string and set imput parameters from tagged template string.
+   * Generate sql string and set input parameters from tagged template string.
    *
    * @param {Template literal} template
    * @return {String}

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

@@ -21,13 +21,11 @@ class ConnectionPool extends BaseConnectionPool {
         defaultConnectionString = CONNECTION_STRING_NAMED_INSTANCE
       }
 
-      if (this.config.requestTimeout == null) {
-        this.config.requestTimeout = 15000
-      }
+      this.config.requestTimeout = this.config.requestTimeout || this.config.timeout || 15000
 
       const cfg = {
         conn_str: this.config.connectionString || defaultConnectionString,
-        conn_timeout: (this.config.connectionTimeout || 15000) / 1000
+        conn_timeout: (this.config.connectionTimeout || this.config.timeout || 15000) / 1000
       }
 
       cfg.conn_str = cfg.conn_str.replace(/#{([^}]*)}/g, (p) => {

package/lib/msnodesqlv8/request.js

@@ -369,7 +369,7 @@ class Request extends BaseRequest {
           }
           const param = this.parameters[name]
           if (param.io === 1 || (param.io === 2 && param.value)) {
-            params.push(castParameter(param.value, param.type, param))
+            params.push(castParameter(param.value, param.type))
           }
         }
 

package/lib/tedious/connection-pool.js

@@ -37,7 +37,7 @@ 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 != null ? this.config.requestTimeout : 15000
+      cfg.options.requestTimeout = 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.2",
+  "version": "8.1.3",
   "main": "index.js",
   "repository": "github:tediousjs/node-mssql",
   "license": "MIT",