Include multiline string literals when creating statements (#1520)

* Include multiline string literals when creating statements * Bump version to 2.6.2
dataform-co · Oct 27, 2023 · 124401e · 124401e
1 parent b374174
commit 124401e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/core/compilers.ts b/core/compilers.ts
@@ -209,6 +209,7 @@ function extractSqlxParts(rootNode: SyntaxTreeNode) {
             SyntaxTreeNodeType.JAVASCRIPT_TEMPLATE_STRING_PLACEHOLDER,
             SyntaxTreeNodeType.SQL_COMMENT,
             SyntaxTreeNodeType.SQL_LITERAL_STRING,
+            SyntaxTreeNodeType.SQL_LITERAL_MULTILINE_STRING,
             SyntaxTreeNodeType.SQL_STATEMENT_SEPARATOR
           ].includes(node.type)
       )

diff --git a/tests/core/core.spec.ts b/tests/core/core.spec.ts
@@ -1319,11 +1319,19 @@ pre_operations {
         compilers.compile(
           `
 select
+  """
+  triple
+  quotes
+  """,
   "asd\\"123'def",
   'asd\\'123"def',
 
 post_operations {
   select
+    """
+    triple
+    quotes
+    """,
     "asd\\"123'def",
     'asd\\'123"def',
 }

diff --git a/tests/core/strings-act-literally.js.test b/tests/core/strings-act-literally.js.test
@@ -17,6 +17,10 @@ const database = ctx.database ? ctx.database.bind(ctx) : undefined;
 
     return [`
 select
+  """
+  triple
+  quotes
+  """,
   "asd\\"123'def",
   'asd\\'123"def',
 
@@ -37,6 +41,10 @@ const database = ctx.database ? ctx.database.bind(ctx) : undefined;
 
     return [`
   select
+    """
+    triple
+    quotes
+    """,
     "asd\\"123'def",
     'asd\\'123"def',
 `];

diff --git a/version.bzl b/version.bzl
@@ -1,3 +1,3 @@
 # NOTE: If you change the format of this line, you must change the bash command
 # in /scripts/publish to extract the version string correctly.
-DF_VERSION = "2.6.1"
+DF_VERSION = "2.6.2"