@sqb/mssql 6.0.1 → 6.0.3

package/mssql-connection.d.ts

@@ -17,4 +17,5 @@ export declare class MssqlConnection implements Adapter.Connection {
     execute(query: QueryRequest): Promise<Adapter.Response>;
     private _bindParams;
     private _convertFields;
+    _normalizeNamedParams(query: QueryRequest): void;
 }

package/mssql-connection.js

@@ -1,3 +1,4 @@
+import { tokenize } from 'fast-tokenizer';
 import sql, {} from 'mssql';
 import { MssqlCursor } from './mssql-cursor.js';
 const typeNameMap = {
@@ -30,6 +31,7 @@ const typeNameMap = {
     VarBinary: { dataType: 'VARBINARY', jsType: 'Buffer' },
     Image: { dataType: 'IMAGE', jsType: 'Buffer' },
 };
+const NAMED_PARAM_PATTERN = /^( *):([a-zA-Z_]\w*)$/;
 export class MssqlConnection {
     intlcon;
     _transaction;
@@ -103,6 +105,8 @@ export class MssqlConnection {
         if (!query.autoCommit && !this._transaction)
             await this.startTransaction();
         const out = {};
+        if (query.normalizeNamedParams)
+            this._normalizeNamedParams(query);
         const m = query.sql.match(/\b(insert into|update|delete from)\b ("?\w+"?)/i);
         if (m) {
             const stmtType = m[1].toLowerCase();
@@ -189,6 +193,46 @@ export class MssqlConnection {
         }
         return result;
     }
+    _normalizeNamedParams(query) {
+        const tokenizer = tokenize(query.sql, {
+            brackets: false,
+            delimiters: undefined,
+            quotes: true,
+            keepBrackets: true,
+            keepQuotes: true,
+            keepDelimiters: true,
+            emptyTokens: true,
+        });
+        let token;
+        let out = '';
+        // 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())) {
+            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;
+        }
+        query.sql = out;
+    }
 }
 function assertDefined(d) {
     if (d == null)

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@sqb/mssql",
   "description": "SQB adapter for the mssql (tedious) driver",
-  "version": "6.0.1",
+  "version": "6.0.3",
   "author": "Panates",
   "license": "Apache-2.0",
   "dependencies": {
+    "fast-tokenizer": "^1.9.0",
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@sqb/builder": "^6.0.1",
-    "@sqb/connect": "^6.0.1",
-    "@sqb/mssql-dialect": "^6.0.1",
+    "@sqb/builder": "^6.0.3",
+    "@sqb/connect": "^6.0.3",
+    "@sqb/mssql-dialect": "^6.0.3",
     "mssql": "^11.0.0 || ^12.0.0"
   },
   "type": "module",