mssql
Advanced tools
Comparing version 9.1.1 to 9.1.2
@@ -67,5 +67,6 @@ 'use strict' | ||
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] | ||
} | ||
@@ -153,9 +154,17 @@ | ||
} | ||
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) | ||
} | ||
} | ||
@@ -244,5 +253,6 @@ if (server === '.' || server === '(.)' || server.toLowerCase() === '(localdb)' || server.toLowerCase() === '(local)') { | ||
let domain | ||
if (/^(.*)\\(.*)$/.exec(user)) { | ||
domain = RegExp.$1 | ||
user = RegExp.$2 | ||
const domainUser = /^(.*)\\(.*)$/.exec(user) | ||
if (domainUser) { | ||
domain = domainUser[1] | ||
user = domainUser[2] | ||
} | ||
@@ -249,0 +259,0 @@ Object.assign(config, { |
@@ -46,4 +46,5 @@ 'use strict' | ||
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] | ||
} | ||
@@ -50,0 +51,0 @@ } |
@@ -0,0 +0,0 @@ 'use strict' |
@@ -534,4 +534,5 @@ 'use strict' | ||
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] | ||
} | ||
@@ -538,0 +539,0 @@ |
@@ -0,0 +0,0 @@ MIT License |
@@ -24,3 +24,3 @@ { | ||
], | ||
"version": "9.1.1", | ||
"version": "9.1.2", | ||
"main": "index.js", | ||
@@ -31,3 +31,3 @@ "repository": "github:tediousjs/node-mssql", | ||
"@tediousjs/connection-string": "^0.4.1", | ||
"commander": "^9.4.0", | ||
"commander": "^11.0.0", | ||
"debug": "^4.3.3", | ||
@@ -39,3 +39,10 @@ "rfdc": "^1.3.0", | ||
"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" | ||
@@ -53,2 +60,3 @@ }, | ||
"scripts": { | ||
"commitlint": "commitlint --from origin/master --to HEAD", | ||
"test": "npm run lint && npm run test-unit", | ||
@@ -58,3 +66,3 @@ "lint": "standard", | ||
"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" | ||
@@ -61,0 +69,0 @@ }, |
Sorry, the diff of this file is too big to display
258961
34
4682
9
+ Addedcommander@11.1.0(transitive)
+ Addedsemver@7.6.2(transitive)
- Removedcommander@9.5.0(transitive)
- Removedlru-cache@6.0.0(transitive)
- Removedsemver@7.6.0(transitive)
- Removedyallist@4.0.0(transitive)
Updatedcommander@^11.0.0