fix: fix unnamed dollar string detection (#15759)

sequelize · Mar 10, 2023 · 5bda2ce · 5bda2ce
1 parent 1ad9a64
commit 5bda2ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/utils/sql.ts b/src/utils/sql.ts
@@ -70,7 +70,7 @@ export function injectReplacements(
 
       const remainingString = sqlString.slice(i, sqlString.length);
 
-      const dollarStringStartMatch = remainingString.match(/^\$(?<name>[a-z_][0-9a-z_])?(\$)/i);
+      const dollarStringStartMatch = remainingString.match(/^\$(?<name>[a-z_][0-9a-z_]*)?(\$)/i);
       const tagName = dollarStringStartMatch?.groups?.name || '';
       if (currentDollarStringTagName === tagName) {
         currentDollarStringTagName = null;
@@ -143,9 +143,10 @@ export function injectReplacements(
 
       const remainingString = sqlString.slice(i, sqlString.length);
 
-      const dollarStringStartMatch = remainingString.match(/^\$(?<name>[a-z_][0-9a-z_]*)?\$/i);
+      const dollarStringStartMatch = remainingString.match(/^\$(?<name>[a-z_][0-9a-z_]*)?(\$)/i);
       if (dollarStringStartMatch) {
         currentDollarStringTagName = dollarStringStartMatch.groups?.name ?? '';
+        i += dollarStringStartMatch[0].length - 1;
 
         continue;
       }

diff --git a/test/unit/utils/sql.test.js b/test/unit/utils/sql.test.js
@@ -387,7 +387,15 @@ describe('injectReplacements (positional replacements)', () => {
     });
   });
 
-  it('does consider the token to be a bind parameter if it is located after a $ quoted string', () => {
+  it('does not consider the token to be a replacement if it is in an unnamed $ quoted string', () => {
+    const sql = injectReplacements('SELECT $$ ? $$', dialect, [1]);
+
+    expectsql(sql, {
+      default: 'SELECT $$ ? $$'
+    });
+  });
+
+  it('does consider the token to be a replacement if it is located after a $ quoted string', () => {
     const sql = injectReplacements('SELECT $$ abc $$ AS string FROM users WHERE id = ?', dialect, [1]);
 
     expectsql(sql, {