fix: allow macro defs to references dates and other builtins

Author: tobymao

examples/sushi/models/waiter_revenue_by_day.sql

@@ -13,6 +13,8 @@ MODEL (
   grain (waiter_id, event_date)
 );
 
+@DEF(where_filter, o.event_date BETWEEN @start_date AND @end_date);
+
 SELECT
   o.waiter_id::INT AS waiter_id, /* Waiter id */
   SUM(oi.quantity * i.price)::DOUBLE AS revenue, /* Revenue from orders taken by this waiter */
@@ -23,7 +25,7 @@ LEFT JOIN sushi.order_items AS oi
 LEFT JOIN sushi.items AS i
   ON oi.item_id = i.id AND oi.event_date = i.event_date
 WHERE
-  o.event_date BETWEEN @start_date AND @end_date
+  @where_filter
 GROUP BY
   o.waiter_id,
   o.event_date

sqlmesh/core/renderer.py

@@ -213,17 +213,17 @@ def _render(
             environment_naming_info=environment_naming_info,
         )
 
+        macro_evaluator.locals.update(render_kwargs)
+
+        if variables:
+            macro_evaluator.locals.setdefault(c.SQLMESH_VARS, {}).update(variables)
+
         for definition in self._macro_definitions:
             try:
                 macro_evaluator.evaluate(definition)
             except Exception as ex:
                 raise_config_error(f"Failed to evaluate macro '{definition}'. {ex}", self._path)
 
-        macro_evaluator.locals.update(render_kwargs)
-
-        if variables:
-            macro_evaluator.locals.setdefault(c.SQLMESH_VARS, {}).update(variables)
-
         resolved_expressions: t.List[t.Optional[exp.Expression]] = []
 
         for expression in expressions:

tests/core/test_model.py

@@ -8983,3 +8983,29 @@ def test_model(context, **kwargs):
 
     assert python_model.kind.disable_restatement is False
     assert python_model.optimize_query is False
+
+
+def test_var_in_def(assert_exp_eq):
+    expressions = d.parse(
+        """
+        MODEL (
+            name db.table,
+            kind INCREMENTAL_BY_TIME_RANGE(
+                time_column ds
+            ),
+        );
+
+        @DEF(var, @start_ds);
+
+        SELECT @var AS ds
+    """
+    )
+
+    model = load_sql_based_model(expressions)
+
+    assert_exp_eq(
+        model.render_query(),
+        """
+        SELECT '1970-01-01' AS "ds"
+        """,
+    )