Fix: propagate correct snapshot dict to renderer for virtual statements

Author: georgesittas

sqlmesh/core/model/definition.py

@@ -586,6 +586,7 @@ def _statement_renderer(self, expression: exp.Expression) -> ExpressionRenderer:
                 only_execution_time=False,
                 default_catalog=self.default_catalog,
                 model_fqn=self.fqn,
+                schema=self.mapping_schema,
             )
         return self._statement_renderer_cache[expression_key]
 
@@ -704,6 +705,7 @@ def _create_renderer(self, expression: exp.Expression) -> ExpressionRenderer:
             python_env=self.python_env,
             only_execution_time=False,
             quote_identifiers=False,
+            schema=self.mapping_schema,
         )
 
     def ctas_query(self, **render_kwarg: t.Any) -> exp.Query:

sqlmesh/core/snapshot/evaluator.py

@@ -978,7 +978,6 @@ def _promote_snapshot(
                 end=end,
                 execution_time=execution_time,
                 engine_adapter=adapter,
-                snapshots=snapshots,
                 deployability_index=deployability_index,
                 table_mapping=table_mapping,
                 runtime_stage=RuntimeStage.PROMOTING,
@@ -988,8 +987,12 @@ def _promote_snapshot(
                 view_name=view_name,
                 model=snapshot.model,
                 environment=environment_naming_info.name,
+                snapshots=snapshots,
                 **render_kwargs,
             )
+
+            snapshot_by_name = {s.name: s for s in (snapshots or {}).values()}
+            render_kwargs["snapshots"] = snapshot_by_name
             adapter.execute(snapshot.model.render_on_virtual_update(**render_kwargs))
 
         if on_complete is not None:

tests/core/test_model.py

@@ -9948,3 +9948,40 @@ def unimportant_testing_macro(evaluator, *projections):
         {"selector": "bla", "bla_variable": 1, "baz_variable": 2}
     )
     assert m.python_env.get(c.SQLMESH_BLUEPRINT_VARS) == Executable.value({"selector": "baz"})
+
+
+def test_extract_schema_in_post_statement(tmp_path: Path) -> None:
+    init_example_project(tmp_path, dialect="duckdb", template=ProjectTemplate.EMPTY)
+
+    config = Config(model_defaults=ModelDefaultsConfig(dialect="duckdb"))
+
+    model1 = tmp_path / "models" / "parent_model.sql"
+    model1.parent.mkdir(parents=True, exist_ok=True)
+    model1.write_text("MODEL (name x); SELECT 1 AS c")
+
+    model2 = tmp_path / "models" / "child_model.sql"
+    model2.parent.mkdir(parents=True, exist_ok=True)
+    model2.write_text(
+        """
+        MODEL (name y);
+        SELECT c FROM x;
+        ON_VIRTUAL_UPDATE_BEGIN;
+        @check_schema('y');
+        ON_VIRTUAL_UPDATE_END;
+        """
+    )
+
+    check_schema = tmp_path / "macros/check_schema.py"
+    check_schema.parent.mkdir(parents=True, exist_ok=True)
+    check_schema.write_text("""
+from sqlglot import exp
+from sqlmesh import macro
+
+@macro()
+def check_schema(evaluator, model_name: str):
+    if evaluator.runtime_stage != 'loading':
+        assert evaluator.columns_to_types(model_name) == {"c": exp.DataType.build("INT")}
+""")
+
+    context = Context(paths=tmp_path, config=config)
+    context.plan(no_prompts=True, auto_apply=True)