fix: Fix parsing for single-quoted resolvables (#6)

* fix: Fix parsing for quoted resolvables * refactor: Grammar-only approach
n8n-io · Aug 18, 2023 · 56e27a3 · 56e27a3
1 parent 0cbe51a
commit 56e27a3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/sql.grammar b/src/sql.grammar
@@ -28,11 +28,16 @@ element {
   Parens { ParenL element* ParenR } |
   Braces { BraceL element* BraceR } |
   Brackets { BracketL element* BracketR } |
+  orphanWrappedResolvable {
+    (OrphanSingleQuote Whitespace? Resolvable Whitespace? OrphanSingleQuote)
+  } |
   Resolvable |
   Whitespace
 }
 
 @tokens {
+  OrphanSingleQuote { "'" }
+
   Resolvable { ResolvableStart resolvableContent* ResolvableEnd }
 
   ResolvableStart[closedBy="ResolvableEnd"] { "{{" }

diff --git a/test/test-tokens.ts b/test/test-tokens.ts
@@ -96,4 +96,20 @@ describe("Parse n8n resolvables", () => {
 
     ist(parser.parse("SELECT my_column FROM {{ 'my_table' }};"), 'Script(Statement(Keyword,Whitespace,Identifier,Whitespace,Keyword,Whitespace,Resolvable,";"))')
   })
+
+  it("parses single-quoted resolvable with no whitespace", () => {
+    ist(parser.parse("SELECT my_column FROM '{{ 'my_table' }}';"), 'Script(Statement(Keyword,Whitespace,Identifier,Whitespace,Keyword,Whitespace,OrphanSingleQuote,Resolvable,OrphanSingleQuote,";"))')
+  });
+
+  it("parses single-quoted resolvable with leading whitespace", () => {
+    ist(parser.parse("SELECT my_column FROM ' {{ 'my_table' }}';"), 'Script(Statement(Keyword,Whitespace,Identifier,Whitespace,Keyword,Whitespace,OrphanSingleQuote,Whitespace,Resolvable,OrphanSingleQuote,";"))')
+  });
+
+  it("parses single-quoted resolvable with trailing whitespace", () => {
+    ist(parser.parse("SELECT my_column FROM '{{ 'my_table' }} ';"), 'Script(Statement(Keyword,Whitespace,Identifier,Whitespace,Keyword,Whitespace,OrphanSingleQuote,Resolvable,Whitespace,OrphanSingleQuote,";"))')
+  });
+
+  it("parses single-quoted resolvable with surrounding whitespace", () => {
+    ist(parser.parse("SELECT my_column FROM ' {{ 'my_table' }} ';"), 'Script(Statement(Keyword,Whitespace,Identifier,Whitespace,Keyword,Whitespace,OrphanSingleQuote,Whitespace,Resolvable,Whitespace,OrphanSingleQuote,";"))')
+  });
 })