Stop rendering jinja within the macro evaluator

Author: georgesittas

examples/sushi/models/customer_revenue_by_day.sql

@@ -21,7 +21,7 @@ WITH order_total AS (
   LEFT JOIN sushi.items AS i
     ON oi.item_id = i.id AND oi.event_date = i.event_date
   WHERE
-    oi.event_date BETWEEN CAST('{{ start_ds }}' as DATE) AND CAST('{{ end_ds }}' as DATE)
+    oi.event_date BETWEEN @start_ds AND @end_ds
   GROUP BY
     oi.order_id,
     oi.event_date
@@ -35,7 +35,7 @@ FROM sushi.orders AS o
 LEFT JOIN order_total AS ot
   ON o.id = ot.order_id AND o.event_date = ot.event_date
 WHERE
-  o.event_date BETWEEN CAST('{{ start_ds }}' as DATE) AND CAST('{{ end_ds }}' as DATE)
+  o.event_date BETWEEN @start_ds AND @end_ds
 GROUP BY
   o.customer_id,
   o.event_date

examples/sushi/models/waiter_as_customer_by_day.sql

@@ -27,6 +27,6 @@ SELECT
 FROM sushi.waiters AS w
 JOIN sushi.customers as c ON w.waiter_id = c.customer_id
 JOIN sushi.waiter_names as wn ON w.waiter_id = wn.id
-WHERE w.event_date BETWEEN @start_date AND @end_date;
+WHERE w.event_date BETWEEN CAST('{{ start_ds }}' as DATE) AND @end_date;
 
 JINJA_END;

sqlmesh/core/macros.py

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

sqlmesh/core/renderer.py

@@ -230,10 +230,6 @@ 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:
@@ -251,9 +247,7 @@ def _resolve_table(table: str | exp.Table) -> str:
 
         for expression in expressions:
             try:
-                transformed_expressions = ensure_list(
-                    macro_evaluator.transform(expression, render_jinja=render_jinja)
-                )
+                transformed_expressions = ensure_list(macro_evaluator.transform(expression))
             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",

tests/core/test_model.py

@@ -2566,11 +2566,15 @@ def test_parse(assert_exp_eq):
           dialect '',
         );
 
+        JINJA_QUERY_BEGIN;
+
         SELECT
           id::INT AS id,
           ds
         FROM x
-        WHERE ds BETWEEN '{{ start_ds }}' AND @end_ds
+        WHERE ds BETWEEN '{{ start_ds }}' AND @end_ds;
+
+        JINJA_END;
     """
     )
     model = load_sql_based_model(expressions, dialect="hive")
@@ -2580,8 +2584,8 @@ def test_parse(assert_exp_eq):
     }
     assert not model.annotated
     assert model.dialect == ""
-    assert isinstance(model.query, exp.Select)
-    assert isinstance(SqlModel.parse_raw(model.json()).query, exp.Select)
+    assert isinstance(model.query, d.JinjaQuery)
+    assert isinstance(SqlModel.parse_raw(model.json()).query, d.JinjaQuery)
     assert_exp_eq(
         model.render_query(),
         """