@sqb/mssql 6.0.2 → 6.0.4

package/mssql-connection.js

@@ -31,7 +31,7 @@ const typeNameMap = {
     VarBinary: { dataType: 'VARBINARY', jsType: 'Buffer' },
     Image: { dataType: 'IMAGE', jsType: 'Buffer' },
 };
-const NAMED_PARAM_PATTERN = / *:([a-zA-Z_]+)/;
+const NAMED_PARAM_PATTERN = /^( *):([a-zA-Z_]\w*)$/;
 export class MssqlConnection {
     intlcon;
     _transaction;
@@ -205,11 +205,29 @@ export class MssqlConnection {
         });
         let token;
         let out = '';
-        let m;
+        // quotes:true hands back an entire string/double-quoted-identifier
+        // literal as one token, so a ":name" occurring inside one never
+        // matches the anchored NAMED_PARAM_PATTERN at all. T-SQL's [bracket]
+        // identifier quoting isn't a "quote" character the tokenizer knows
+        // about though (brackets:false), so "[col:name]" comes back as three
+        // separate tokens ("[col", ":name", "]") - track bracket state
+        // explicitly so a ":name" inside one isn't mistaken for a param.
+        let inBracket = false;
         while ((token = tokenizer.next())) {
-            m = NAMED_PARAM_PATTERN.exec(token);
-            if (m) {
-                token = '@' + m[1];
+            const trimmed = token.trim();
+            if (inBracket) {
+                if (trimmed.includes(']'))
+                    inBracket = false;
+            }
+            else if (trimmed.startsWith('[')) {
+                inBracket = true;
+            }
+            else {
+                const m = NAMED_PARAM_PATTERN.exec(token);
+                if (m) {
+                    const [, leading, name] = m;
+                    token = leading + '@' + name;
+                }
             }
             out += token;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/mssql",
   "description": "SQB adapter for the mssql (tedious) driver",
-  "version": "6.0.2",
+  "version": "6.0.4",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
@@ -9,9 +9,9 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^6.0.2",
-    "@sqb/connect": "^6.0.2",
-    "@sqb/mssql-dialect": "^6.0.2",
+    "@sqb/builder": "^6.0.4",
+    "@sqb/connect": "^6.0.4",
+    "@sqb/mssql-dialect": "^6.0.4",
     "mssql": "^11.0.0 || ^12.0.0"
   },
   "type": "module",