Fix: Expand the parent's model query during query rendering if the parent is not categorized

Author: izeigerman

sqlmesh/core/engine_adapter/base.py

@@ -152,6 +152,7 @@ def with_log_level(self, level: int) -> EngineAdapter:
             register_comments=self._register_comments,
             null_connection=True,
             multithreaded=self._multithreaded,
+            pretty_sql=self._pretty_sql,
             **self._extra_config,
         )
 

sqlmesh/core/renderer.py

@@ -317,7 +317,9 @@ def _resolve_tables(
                 **table_mapping,
             }
             expand = set(expand) | {
-                name for name, snapshot in snapshots.items() if snapshot.is_embedded
+                name
+                for name, snapshot in snapshots.items()
+                if snapshot.is_embedded or not snapshot.categorized
             }
 
             if expand:

sqlmesh/core/snapshot/definition.py

@@ -1014,6 +1014,11 @@ def categorize_as(self, category: SnapshotChangeCategory) -> None:
 
         self.change_category = category
 
+    @property
+    def categorized(self) -> bool:
+        """Whether the snapshot has been categorized."""
+        return self.change_category is not None and self.version is not None
+
     def table_name(self, is_deployable: bool = True) -> str:
         """Full table name pointing to the materialized location of the snapshot.
 

tests/core/test_integration.py

@@ -4075,6 +4075,25 @@ def test_no_backfill_for_model_downstream_of_metadata_change(init_and_plan_conte
     )
 
 
+@time_machine.travel("2023-01-08 15:00:00 UTC")
+def test_evaluate_of_uncategorized_snapshot(init_and_plan_context: t.Callable):
+    context, plan = init_and_plan_context("examples/sushi")
+    context.apply(plan)
+
+    # Add a new projection
+    model = context.get_model("sushi.waiter_revenue_by_day")
+    context.upsert_model(add_projection_to_model(t.cast(SqlModel, model)))
+
+    # Downstream model references the new projection
+    downstream_model = context.get_model("sushi.top_waiters")
+    context.upsert_model(add_projection_to_model(t.cast(SqlModel, downstream_model), literal=False))
+
+    df = context.evaluate(
+        "sushi.top_waiters", start="2023-01-05", end="2023-01-06", execution_time=now()
+    )
+    assert set(df["one"].tolist()) == {1}
+
+
 @time_machine.travel("2023-01-08 15:00:00 UTC")
 def test_dbt_requirements(sushi_dbt_context: Context):
     assert set(sushi_dbt_context.requirements) == {"dbt-core", "dbt-duckdb"}