Skip to content

Fix: Make the dbt graph available during parse time too #5329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
themisvaltinos merged 1 commit into from
Sep 9, 2025
Merged

Fix: Make the dbt graph available during parse time too #5329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions sqlmesh/dbt/adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down Expand Up @@ -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]:
Expand Down
21 changes: 18 additions & 3 deletions tests/dbt/test_transformation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2197,7 +2197,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,
Expand All @@ -2208,6 +2208,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)",
Expand All @@ -2220,10 +2236,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
Expand Down