Make string placeholder escaping correctly work

Author: Uku Pattak

src/core/Tokenizer.js

@@ -188,7 +188,7 @@ export default class Tokenizer {
         return this.getPlaceholderTokenWithKey({
             input,
             regex: this.STRING_NAMED_PLACEHOLDER_REGEX,
-            parseKey: (v) => v.slice(2, -1).replace(/\\/g, "")
+            parseKey: (v) => this.getEscapedPlaceholderKey({key: v.slice(2, -1), stringChar: v.slice(-1)})
         });
     }
 
@@ -208,6 +208,10 @@ export default class Tokenizer {
         return token;
     }
 
+    getEscapedPlaceholderKey({key, stringChar}) {
+        return key.replace(new RegExp(_.escapeRegExp("\\") + stringChar, "g"), stringChar);
+    }
+
     // Decimal, binary, or hex numbers
     getNumberToken(input) {
         return this.getTokenOnFirstMatch({

test/StandardSqlFormatterTest.js

@@ -50,13 +50,14 @@ describe("StandardSqlFormatter", function() {
 
     it("replaces @variables with param values", function() {
         const result = sqlFormatter.format(
-            "SELECT @variable, @a1_2.3$, @'var name', @\"var name\", @`var name`, @[var name];",
+            "SELECT @variable, @a1_2.3$, @'var name', @\"var name\", @`var name`, @[var name], @'var\\name';",
             {
                 language: "sql",
                 params: {
                     "variable": "\"variable value\"",
                     "a1_2.3$": "'weird value'",
-                    "var name": "'var value'"
+                    "var name": "'var value'",
+                    "var\\name": "'var\\ value'"
                 }
             }
         );
@@ -67,7 +68,8 @@ describe("StandardSqlFormatter", function() {
             "  'var value',\n" +
             "  'var value',\n" +
             "  'var value',\n" +
-            "  'var value';\n"
+            "  'var value',\n" +
+            "  'var\\ value';\n"
         );
     });
 
@@ -88,14 +90,14 @@ describe("StandardSqlFormatter", function() {
 
     it("replaces :variables with param values", function() {
         const result = sqlFormatter.format(
-            "SELECT :variable, :a1_2.3$, :'var name', :\"var name\", :`var name`, :[var name], :'escaped\\-var';",
+            "SELECT :variable, :a1_2.3$, :'var name', :\"var name\", :`var name`, :[var name], :'escaped \\'var\\'';",
             {
                 language: "sql",
                 params: {
                     "variable": "\"variable value\"",
                     "a1_2.3$": "'weird value'",
                     "var name": "'var value'",
-                    "escaped-var": "'weirder value'"
+                    "escaped 'var'": "'weirder value'"
                 }
             }
         );