Fix: Make the dbt graph available during parse time too

Author: themisvaltinos

sqlmesh/dbt/adapter.py

@@ -168,7 +168,8 @@ def compare_dbr_version(self, major: int, minor: int) -> int:
 
     @property
     def graph(self) -> t.Any:
-        return AttributeDict(
+        flat_graph = self.jinja_globals.get("flat_graph", None)
+        return flat_graph or AttributeDict(
             {
                 "exposures": {},
                 "groups": {},
@@ -276,10 +277,6 @@ def __init__(
             **table_mapping,
         }
 
-    @property
-    def graph(self) -> t.Any:
-        return self.jinja_globals.get("flat_graph", super().graph)
-
     def get_relation(
         self, database: t.Optional[str], schema: str, identifier: str
     ) -> t.Optional[BaseRelation]:

tests/dbt/test_transformation.py

@@ -2189,7 +2189,7 @@ def test_on_run_start_end():
         runtime_stage=RuntimeStage.BEFORE_ALL,
     )
 
-    rendered_after_all = render_statements(
+    runtime_rendered_after_all = render_statements(
         root_environment_statements.after_all,
         dialect=sushi_context.default_dialect,
         python_env=root_environment_statements.python_env,
@@ -2200,6 +2200,22 @@ def test_on_run_start_end():
         engine_adapter=sushi_context.engine_adapter,
     )
 
+    # not passing engine adapter simulates "parse-time" rendering
+    parse_time_rendered_after_all = render_statements(
+        root_environment_statements.after_all,
+        dialect=sushi_context.default_dialect,
+        python_env=root_environment_statements.python_env,
+        jinja_macros=root_environment_statements.jinja_macros,
+        snapshots=sushi_context.snapshots,
+        runtime_stage=RuntimeStage.AFTER_ALL,
+        environment_naming_info=EnvironmentNamingInfo(name="dev"),
+    )
+
+    # validate that the graph_table statement is the same between parse-time and runtime rendering
+    assert sorted(parse_time_rendered_after_all) == sorted(runtime_rendered_after_all)
+    graph_table_stmt = runtime_rendered_after_all[-1]
+    assert graph_table_stmt == parse_time_rendered_after_all[-1]
+
     assert rendered_before_all == [
         "CREATE TABLE IF NOT EXISTS analytic_stats (physical_table TEXT, evaluation_time TEXT)",
         "CREATE TABLE IF NOT EXISTS to_be_executed_last (col TEXT)",
@@ -2212,10 +2228,9 @@ def test_on_run_start_end():
         "CREATE OR REPLACE TABLE schema_table_sushi__dev AS SELECT 'sushi__dev' AS schema",
         "DROP TABLE to_be_executed_last",
     ]
-    assert sorted(rendered_after_all[:-1]) == sorted(expected_statements)
+    assert sorted(runtime_rendered_after_all[:-1]) == sorted(expected_statements)
 
     # Assert the models with their materialisations are present in the rendered graph_table statement
-    graph_table_stmt = rendered_after_all[-1]
     assert "'model.sushi.simple_model_a' AS unique_id, 'table' AS materialized" in graph_table_stmt
     assert "'model.sushi.waiters' AS unique_id, 'ephemeral' AS materialized" in graph_table_stmt
     assert "'model.sushi.simple_model_b' AS unique_id, 'table' AS materialized" in graph_table_stmt