mssql 12.7.11 → 12.7.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,7 @@
1
1
  'use strict'
2
2
 
3
3
  const MSSQLError = require('./mssql-error')
4
+ const { stripOdbcPrefix } = require('../utils')
4
5
 
5
6
  /**
6
7
  * Class RequestError.
@@ -43,10 +44,7 @@ class RequestError extends MSSQLError {
43
44
  }
44
45
 
45
46
  this.name = 'RequestError'
46
- const parsedMessage = (/^\[Microsoft\]\[SQL Server Native Client 11\.0\](?:\[SQL Server\])?([\s\S]*)$/).exec(this.message)
47
- if (parsedMessage) {
48
- this.message = parsedMessage[1]
49
- }
47
+ this.message = stripOdbcPrefix(this.message)
50
48
  }
51
49
  }
52
50
 
@@ -4,7 +4,7 @@ const msnodesql = require('msnodesqlv8')
4
4
  const debug = require('debug')('mssql:msv8')
5
5
  const BaseRequest = require('../base/request')
6
6
  const RequestError = require('../error/request-error')
7
- const { IDS, objectHasProperty, assertSafeColumnName, assertSafeTypeName, assertSafeTypeSize, assertSafeProcedureName } = require('../utils')
7
+ const { IDS, objectHasProperty, assertSafeColumnName, assertSafeTypeName, assertSafeTypeSize, assertSafeProcedureName, stripOdbcPrefix } = require('../utils')
8
8
  const { TYPES, DECLARATIONS, declare } = require('../datatypes')
9
9
  const { PARSERS: UDT } = require('../udt')
10
10
  const Table = require('../table')
@@ -879,10 +879,7 @@ class Request extends BaseRequest {
879
879
  req.on('info', (msg, more) => {
880
880
  if (finished) return
881
881
 
882
- const parsedMessage = (/^\[Microsoft\]\[SQL Server Native Client 11\.0\](?:\[SQL Server\])?([\s\S]*)$/).exec(msg.message)
883
- if (parsedMessage) {
884
- msg.message = parsedMessage[1]
885
- }
882
+ msg.message = stripOdbcPrefix(msg.message)
886
883
 
887
884
  const info = {
888
885
  message: msg.message,
package/lib/utils.js CHANGED
@@ -50,6 +50,13 @@ const TYPE_SIZE = /^\w*$/
50
50
  // is the documented way to include one literally.
51
51
  const escapesQuotedIdentifier = (name) => String(name).replace(/]]/g, '').includes(']')
52
52
 
53
+ // ODBC puts the components a message came through in front of it: the vendor and the driver,
54
+ // such as `[Microsoft][ODBC Driver 18 for SQL Server]`, then `[SQL Server]` when the server
55
+ // raised it. The driver manager's own messages name it instead, followed by a space on Windows,
56
+ // `[Microsoft][ODBC Driver Manager] `, and by nothing with unixODBC, `[unixODBC][Driver Manager]`.
57
+ // Only that one prefix is taken off, so what a PRINT or RAISERROR sent is kept as it was sent.
58
+ const ODBC_PREFIX = /^(?:\[Microsoft\]\[ODBC Driver Manager\] |\[unixODBC\]\[Driver Manager\]|\[Microsoft\]\[[^\]]+\](?:\[SQL Server\])?)/
59
+
53
60
  module.exports = {
54
61
  objectHasProperty: (object, property) => Object.prototype.hasOwnProperty.call(object, property),
55
62
  isValidParameterName: (name) => {
@@ -107,6 +114,7 @@ module.exports = {
107
114
  }
108
115
  return column
109
116
  },
117
+ stripOdbcPrefix: (message) => typeof message === 'string' ? message.replace(ODBC_PREFIX, '') : message,
110
118
  INCREMENT,
111
119
  IDS: {
112
120
  get: IDS.get.bind(IDS),
package/package.json CHANGED
@@ -21,7 +21,7 @@
21
21
  "azure",
22
22
  "node-mssql"
23
23
  ],
24
- "version": "12.7.11",
24
+ "version": "12.7.12",
25
25
  "main": "index.js",
26
26
  "type": "commonjs",
27
27
  "repository": {