fix: fix unnamed dollar string detection (v7) (#15758)

sequelize · Mar 10, 2023 · b2fe30f · b2fe30f
1 parent f1c15a7
commit b2fe30f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/core/src/utils/sql.ts b/packages/core/src/utils/sql.ts
@@ -69,7 +69,7 @@ function mapBindParametersAndReplacements(
 
       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) {
@@ -148,6 +148,7 @@ function mapBindParametersAndReplacements(
       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/packages/core/test/unit/utils/sql.test.ts b/packages/core/test/unit/utils/sql.test.ts
@@ -670,7 +670,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, {