mssql 9.1.1 → 9.1.3

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/README.md

@@ -2,7 +2,7 @@
 
 Microsoft SQL Server client for Node.js
 
-[![NPM Version][npm-image]][npm-url] [![NPM Downloads][downloads-image]][downloads-url] [![Travis CI][travis-image]][travis-url] [![Appveyor CI][appveyor-image]][appveyor-url] [![Join the chat at https://gitter.im/patriksimek/node-mssql](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/patriksimek/node-mssql?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![NPM Version][npm-image]][npm-url] [![NPM Downloads][downloads-image]][downloads-url] [![Appveyor CI][appveyor-image]][appveyor-url] [![Join the chat at https://gitter.im/patriksimek/node-mssql](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/patriksimek/node-mssql?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Supported TDS drivers:
 - [Tedious][tedious-url] (pure JavaScript - Windows/macOS/Linux, default)
@@ -140,6 +140,8 @@ async () => {
 * [SQL injection](#sql-injection)
 * [Known Issues](#known-issues)
 * [Contributing](https://github.com/tediousjs/node-mssql/wiki/Contributing)
+* [8.x to 9.x changes](#8x-to-9x-changes)
+* [7.x to 8.x changes](#7x-to-8x-changes)
 * [6.x to 7.x changes](#6x-to-7x-changes)
 * [5.x to 6.x changes](#5x-to-6x-changes)
 * [4.x to 5.x changes](#4x-to-5x-changes)
@@ -2025,10 +2027,10 @@ request.query('select @myval as myval', (err, result) => {
 - If you're facing problems with connecting SQL Server 2000, try setting the default TDS version to 7.1 with `config.options.tdsVersion = '7_1'` ([issue](https://github.com/tediousjs/node-mssql/issues/36))
 - If you're executing a statement longer than 4000 chars on SQL Server 2000, always use [batch](#batch-batch-callback) instead of [query](#query-command-callback) ([issue](https://github.com/tediousjs/node-mssql/issues/68))
 
-## 8.x to 7.x changes
+## 8.x to 9.x changes
 
 - Upgraded to tedious version 15
-- Dropped support for Node version < 12
+- Dropped support for Node version <= 12
 
 ## 7.x to 8.x changes
 
@@ -2091,8 +2093,6 @@ to create new connections or not
 [downloads-url]: https://www.npmjs.com/package/mssql
 [david-image]: https://img.shields.io/david/tediousjs/node-mssql.svg?style=flat-square
 [david-url]: https://david-dm.org/tediousjs/node-mssql
-[travis-image]: https://img.shields.io/travis/tediousjs/node-mssql/master.svg?style=flat-square&label=unit
-[travis-url]: https://travis-ci.org/tediousjs/node-mssql
 [appveyor-image]: https://ci.appveyor.com/api/projects/status/e5gq1a0ujwams9t7/branch/master?svg=true
 [appveyor-url]: https://ci.appveyor.com/project/tediousjs/node-mssql
 

package/lib/base/connection-pool.js

@@ -64,9 +64,10 @@ class ConnectionPool extends EventEmitter {
     this.config.arrayRowMode = this.config.arrayRowMode || false
     this.config.validateConnection = 'validateConnection' in this.config ? this.config.validateConnection : true
 
-    if (/^(.*)\\(.*)$/.exec(this.config.server)) {
-      this.config.server = RegExp.$1
-      this.config.options.instanceName = RegExp.$2
+    const namedServer = /^(.*)\\(.*)$/.exec(this.config.server)
+    if (namedServer) {
+      this.config.server = namedServer[1]
+      this.config.options.instanceName = namedServer[2]
     }
 
     if (typeof this.config.options.useColumnNames !== 'undefined' && this.config.options.useColumnNames !== true) {
@@ -149,13 +150,21 @@ class ConnectionPool extends EventEmitter {
           if (/^tcp:/i.test(server)) {
             server = server.substr(4)
           }
-          if (/^(.*)\\(.*)$/.exec(server)) {
-            server = RegExp.$1
-            instanceName = RegExp.$2
+          const namedServerParts = /^(.*)\\(.*)$/.exec(server)
+          if (namedServerParts) {
+            server = namedServerParts[1].trim()
+            instanceName = namedServerParts[2].trim()
           }
-          if (/^(.*),(.*)$/.exec(server)) {
-            server = RegExp.$1.trim()
-            port = parseInt(RegExp.$2.trim(), 10)
+          const serverParts = /^(.*),(.*)$/.exec(server)
+          if (serverParts) {
+            server = serverParts[1].trim()
+            port = parseInt(serverParts[2].trim(), 10)
+          } else {
+            const instanceParts = /^(.*),(.*)$/.exec(instanceName)
+            if (instanceParts) {
+              instanceName = instanceParts[1].trim()
+              port = parseInt(instanceParts[2].trim(), 10)
+            }
           }
           if (server === '.' || server === '(.)' || server.toLowerCase() === '(localdb)' || server.toLowerCase() === '(local)') {
             server = 'localhost'
@@ -239,9 +248,10 @@ class ConnectionPool extends EventEmitter {
         case 'user id': {
           let user = value
           let domain
-          if (/^(.*)\\(.*)$/.exec(user)) {
-            domain = RegExp.$1
-            user = RegExp.$2
+          const domainUser = /^(.*)\\(.*)$/.exec(user)
+          if (domainUser) {
+            domain = domainUser[1]
+            user = domainUser[2]
           }
           Object.assign(config, {
             domain,

package/lib/error/request-error.js

@@ -43,8 +43,9 @@ class RequestError extends MSSQLError {
     }
 
     this.name = 'RequestError'
-    if ((/^\[Microsoft\]\[SQL Server Native Client 11\.0\](?:\[SQL Server\])?([\s\S]*)$/).exec(this.message)) {
-      this.message = RegExp.$1
+    const parsedMessage = (/^\[Microsoft\]\[SQL Server Native Client 11\.0\](?:\[SQL Server\])?([\s\S]*)$/).exec(this.message)
+    if (parsedMessage) {
+      this.message = parsedMessage[1]
     }
   }
 }

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

@@ -38,8 +38,15 @@ class ConnectionPool extends BaseConnectionPool {
             return this.config.options.trustedConnection ? 'Yes' : 'No'
           case 'encrypt':
             return this.config.options.encrypt ? 'Yes' : 'No'
-          default:
-            return this.config[key] != null ? this.config[key] : ''
+          default: {
+            let val = this.config[key] || ''
+            // quote strings that contain '{' or '}' but not ones that start and end with them (assume they are already quoted)
+            if (val && typeof val === 'string' && !(val.startsWith('{') && val.endsWith('}')) && (val.indexOf('{') !== -1 || val.indexOf('}') !== -1)) {
+              // quote values in `{}` and escape any existing `}` chars
+              val = `{${val.replace(/}/g, '}}')}}`
+            }
+            return val
+          }
         }
       })
 

package/lib/msnodesqlv8/request.js

@@ -531,8 +531,9 @@ class Request extends BaseRequest {
         })
 
         req.on('info', msg => {
-          if ((/^\[Microsoft\]\[SQL Server Native Client 11\.0\](?:\[SQL Server\])?([\s\S]*)$/).exec(msg.message)) {
-            msg.message = RegExp.$1
+          const parsedMessage = (/^\[Microsoft\]\[SQL Server Native Client 11\.0\](?:\[SQL Server\])?([\s\S]*)$/).exec(msg.message)
+          if (parsedMessage) {
+            msg.message = parsedMessage[1]
           }
 
           this.emit('info', {

package/package.json

@@ -21,20 +21,27 @@
     "azure",
     "node-mssql"
   ],
-  "version": "9.1.1",
+  "version": "9.1.3",
   "main": "index.js",
   "repository": "github:tediousjs/node-mssql",
   "license": "MIT",
   "dependencies": {
     "@tediousjs/connection-string": "^0.4.1",
-    "commander": "^9.4.0",
+    "commander": "^11.0.0",
     "debug": "^4.3.3",
     "rfdc": "^1.3.0",
     "tarn": "^3.0.2",
     "tedious": "^15.0.1"
   },
   "devDependencies": {
+    "@commitlint/cli": "^17.6.6",
+    "@commitlint/config-conventional": "^17.6.6",
+    "@semantic-release/commit-analyzer": "^10.0.1",
+    "@semantic-release/github": "^9.0.3",
+    "@semantic-release/npm": "^10.0.4",
+    "@semantic-release/release-notes-generator": "^11.0.4",
     "mocha": "^10.0.0",
+    "semantic-release": "^21.0.7",
     "standard": "^17.0.0"
   },
   "engines": {
@@ -47,11 +54,12 @@
     "msnodesqlv8.js"
   ],
   "scripts": {
+    "commitlint": "commitlint --from origin/master --to HEAD",
     "test": "npm run lint && npm run test-unit",
     "lint": "standard",
     "test-unit": "mocha --exit -t 15000 test/common/unit.js",
     "test-tedious": "mocha --exit -t 15000 test/tedious",
-    "test-msnodesqlv8": "mocha --exit -t 15000 test/msnodesqlv8",
+    "test-msnodesqlv8": "mocha --exit -t 30000 test/msnodesqlv8",
     "test-cli": "mocha --exit -t 15000 test/common/cli.js"
   },
   "bin": {