Fix: properly handle {% raw %}...{% endraw %} during rendering

Author: georgesittas

sqlmesh/core/macros.py

@@ -246,7 +246,9 @@ def send(
             )
 
     def transform(
-        self, expression: exp.Expression
+        self,
+        expression: exp.Expression,
+        render_jinja: bool = True,
     ) -> exp.Expression | t.List[exp.Expression] | None:
         changed = False
 
@@ -284,7 +286,7 @@ def evaluate_macros(
                     return exp.to_identifier(text, quoted=node.quoted or None)
             if node.is_string:
                 text = node.this
-                if has_jinja(text):
+                if render_jinja and has_jinja(text):
                     changed = True
                     node.set("this", self.jinja_env.from_string(node.this).render())
                 return node

sqlmesh/core/renderer.py

@@ -230,6 +230,10 @@ def _resolve_table(table: str | exp.Table) -> str:
                     f"Could not render or parse jinja at '{self._path}'.\n{ex}"
                 ) from ex
 
+            render_jinja = False
+        else:
+            render_jinja = True
+
         macro_evaluator.locals.update(render_kwargs)
 
         if variables:
@@ -247,7 +251,9 @@ def _resolve_table(table: str | exp.Table) -> str:
 
         for expression in expressions:
             try:
-                transformed_expressions = ensure_list(macro_evaluator.transform(expression))
+                transformed_expressions = ensure_list(
+                    macro_evaluator.transform(expression, render_jinja=render_jinja)
+                )
             except Exception as ex:
                 raise_config_error(
                     f"Failed to resolve macros for\n\n{expression.sql(dialect=self._dialect, pretty=True)}\n\n{ex}\n",
@@ -278,6 +284,7 @@ def _resolve_table(table: str | exp.Table) -> str:
         # MacroEvaluator can resolve columns_to_types calls and provide true schemas.
         if should_cache and (not self.schema.empty or not macro_evaluator.columns_to_types_called):
             self._cache = resolved_expressions
+
         return resolved_expressions
 
     def update_cache(self, expression: t.Optional[exp.Expression]) -> None:

tests/core/test_model.py

@@ -11543,3 +11543,18 @@ def test_text_diff_optimize_query():
     diff = model1.text_diff(model2)
     assert diff, "Expected diff to show optimize_query change"
     assert "+  optimize_query" in diff.lower()
+
+
+def test_raw_jinja_raw_tag():
+    expressions = d.parse(
+        """
+        MODEL (name test);
+
+        JINJA_QUERY_BEGIN;
+        SELECT {% raw %} '{{ foo }}' {% endraw %} AS col;
+        JINJA_END;
+        """
+    )
+
+    model = load_sql_based_model(expressions)
+    assert model.render_query().sql() == "SELECT '{{ foo }}' AS \"col\""