fix tconbeer#471: handle nested dictionary in jinja expression

benjamin-awd · Oct 19, 2023 · e4007ff · e4007ff
1 parent 614f526
commit e4007ff
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 1 deletion.
diff --git a/src/sqlfmt/rules/jinja.py b/src/sqlfmt/rules/jinja.py
@@ -244,7 +244,7 @@
     Rule(
         name="jinja_expression_end",
         priority=610,
-        pattern=group(r"-?\}\}"),
+        pattern=group(r"-?\}\}(?<!\"\}\})"),
         action=actions.raise_sqlfmt_bracket_error,
     ),
 ]
diff --git a/tests/data/unit_tests/test_nested_dictionary/test_nested_dictionary.sql b/tests/data/unit_tests/test_nested_dictionary/test_nested_dictionary.sql
@@ -0,0 +1,38 @@
+-- source: https://github.com/tconbeer/sqlfmt/issues/471
+{{
+    config(
+        materialized='incremental',
+        incremental_strategy='insert_overwrite',
+        external_location=generate_external_location("baz", "datalake/producer=foo/object=bar"),
+        partitioned_by=['batch_date'],
+        lf_tags_config={
+        'enabled': true,
+        'tags': {
+            'domain': 'foo',
+            'sensitivity': 'public'
+            }
+        }
+    )
+}}
+select
+    batch_date
+from
+    {{ ref('bar') }}
+{% if is_incremental() %}
+where batch_date = '{{ var("ds") }}'
+{% endif %}
+)))))__SQLFMT_OUTPUT__(((((
+-- source: https://github.com/tconbeer/sqlfmt/issues/471
+{{
+    config(
+        materialized="incremental",
+        incremental_strategy="insert_overwrite",
+        external_location=generate_external_location("baz", "datalake/producer=foo/object=bar"),
+        partitioned_by=["batch_date"],
+        lf_tags_config={"enabled": true, "tags": {"domain": "foo", "sensitivity": "public"}},
+    )
+}}
+select batch_date
+from {{ ref("bar") }}
+{% if is_incremental() %} where batch_date = '{{ var("ds") }}' {% endif %}
+
diff --git a/tests/unit_tests/test_nested_dictionary.py b/tests/unit_tests/test_nested_dictionary.py
@@ -0,0 +1,11 @@
+from sqlfmt.api import format_string
+from sqlfmt.mode import Mode
+from tests.util import read_test_data
+
+
+def test_handle_nested_dictionary_in_jinja_expression() -> None:
+    source_string, expected_string = read_test_data(
+        "unit_tests/test_nested_dictionary/test_nested_dictionary.sql"
+    )
+    actual = format_string(source_string, mode=Mode(line_length=100))
+    assert expected_string == actual