Fix: Only selected models need to be promoted when --inlclude-unmodified flag is provided (#5561)

Author: izeigerman

sqlmesh/core/plan/definition.py

@@ -63,7 +63,7 @@ class Plan(PydanticModel, frozen=True):
     restatements: t.Dict[SnapshotId, Interval]
     """
     All models being restated, which are typically the explicitly selected ones + their downstream dependencies.
-    
+
     Note that dev previews are also considered restatements, so :selected_models_to_restate can be empty
     while :restatements is still populated with dev previews
     """
@@ -213,8 +213,8 @@ def environment(self) -> Environment:
 
         snapshots_by_name = self.context_diff.snapshots_by_name
         snapshots = [s.table_info for s in self.snapshots.values()]
-        promoted_snapshot_ids = None
-        if self.is_dev and not self.include_unmodified:
+        promotable_snapshot_ids = None
+        if self.is_dev:
             if self.selected_models_to_backfill is not None:
                 # Only promote models that have been explicitly selected for backfill.
                 promotable_snapshot_ids = {
@@ -225,12 +225,14 @@ def environment(self) -> Environment:
                         if m in snapshots_by_name
                     ],
                 }
-            else:
+            elif not self.include_unmodified:
                 promotable_snapshot_ids = self.context_diff.promotable_snapshot_ids.copy()
 
-            promoted_snapshot_ids = [
-                s.snapshot_id for s in snapshots if s.snapshot_id in promotable_snapshot_ids
-            ]
+        promoted_snapshot_ids = (
+            [s.snapshot_id for s in snapshots if s.snapshot_id in promotable_snapshot_ids]
+            if promotable_snapshot_ids is not None
+            else None
+        )
 
         previous_finalized_snapshots = (
             self.context_diff.environment_snapshots

tests/core/integration/test_plan_options.py

@@ -476,3 +476,54 @@ def test_create_environment_no_changes_with_selector(init_and_plan_context: t.Ca
 
     schema_objects = context.engine_adapter.get_data_objects("sushi__dev")
     assert {o.name for o in schema_objects} == {"top_waiters"}
+
+
+@time_machine.travel("2023-01-08 15:00:00 UTC")
+def test_include_unmodified(init_and_plan_context: t.Callable):
+    context, plan = init_and_plan_context("examples/sushi")
+    context.apply(plan)
+
+    plan = context.plan_builder(
+        "dev",
+        include_unmodified=True,
+        skip_tests=True,
+    ).build()
+
+    all_snapshots = context.snapshots
+
+    assert len(plan.environment.snapshots) == len(all_snapshots)
+    assert plan.environment.promoted_snapshot_ids is None
+
+    context.apply(plan)
+
+    data_objs = context.engine_adapter.get_data_objects("sushi__dev")
+    assert len(data_objs) == len(
+        [s for s in all_snapshots.values() if s.is_model and not s.is_symbolic]
+    )
+
+
+@time_machine.travel("2023-01-08 15:00:00 UTC")
+def test_select_models_with_include_unmodified(init_and_plan_context: t.Callable):
+    context, plan = init_and_plan_context("examples/sushi")
+    context.apply(plan)
+
+    plan = context.plan_builder(
+        "dev",
+        select_models=["*top_waiters", "*customer_revenue_by_day"],
+        include_unmodified=True,
+        skip_tests=True,
+    ).build()
+
+    assert len(plan.environment.snapshots) == len(context.snapshots)
+
+    promoted_set = {s_id.name for s_id in plan.environment.promoted_snapshot_ids}
+    assert promoted_set == {
+        '"memory"."sushi"."customer_revenue_by_day"',
+        '"memory"."sushi"."top_waiters"',
+    }
+
+    context.apply(plan)
+
+    data_objs = context.engine_adapter.get_data_objects("sushi__dev")
+    assert len(data_objs) == 2
+    assert {o.name for o in data_objs} == {"customer_revenue_by_day", "top_waiters"}