Merge pull request #195 from Altinity/resubmit_pull_123

fix corner case when quotes escaped inside quotes
Altinity · Jun 15, 2020 · 9022cd3 · 9022cd3
2 parents e2873e6 + fbdc3e3
commit 9022cd3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/spec/scanner_specs.jest.ts b/spec/scanner_specs.jest.ts
@@ -504,4 +504,26 @@ describe("scanner:", () => {
             expect(scanner.toAST()).toEqual(expectedAST);
         });
     });
+
+    describe("AST case 15 (escaped quotes inside quotes)", () => {
+        let query = "SELECT now() AS t, 'test\\\'value' AS v FROM $table WHERE v=\"test\\\"field\"",
+            scanner = new Scanner(query);
+
+        let expectedAST = {
+            "root": [],
+            "select": [
+                "now() AS t",
+                "'test\\\'value' AS v"
+            ],
+            "from": [
+                "$table"
+            ],
+            "where": [
+                "v = \"test\\\"field\""
+            ],
+        };
+        it("expects equality", () => {
+            expect(scanner.toAST()).toEqual(expectedAST);
+        });
+    });
 });
diff --git a/src/scanner.ts b/src/scanner.ts
@@ -246,7 +246,7 @@ let wsRe = "\\s+",
     intRe = "\\d+",
     powerIntRe = "\\d+e\\d+",
     floatRe = "\\d+\\.\\d*|\\d*\\.\\d+|\\d+[eE][-+]\\d+",
-    stringRe = "('[^']*')|(`[^`]*`)|(\"[^\"]*\")",
+    stringRe = "('(?:[^'\\\\]|\\\\.)*')|(`(?:[^`\\\\]|\\\\.)*`)|(\"(?:[^\"\\\\]|\\\\.)*\")",
     binaryOpRe = "=>|\\|\\||>=|<=|==|!=|<>|->|[-+/%*=<>\\.!]",
     statementRe = "\\b(select|from|where|having|order by|group by|limit|format|prewhere|union all)\\b",
     joinsRe = "(any inner join|any left join|all inner join|all left join" +