Skip to content

Commit d1b2940

Browse files
revise the property name to dbt_name
1 parent f5c48f0 commit d1b2940

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

sqlmesh/core/context.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,9 +1678,9 @@ def plan_builder(
16781678
console=self.console,
16791679
user_provided_flags=user_provided_flags,
16801680
selected_models={
1681-
node_name
1681+
dbt_name
16821682
for model in model_selector.expand_model_selections(select_models or "*")
1683-
if (node_name := snapshots[model].node.node_name)
1683+
if (dbt_name := snapshots[model].node.dbt_name)
16841684
},
16851685
explain=explain or False,
16861686
ignore_cron=ignore_cron or False,

sqlmesh/core/node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ class _Node(PydanticModel):
199199
interval_unit_: t.Optional[IntervalUnit] = Field(alias="interval_unit", default=None)
200200
tags: t.List[str] = []
201201
stamp: t.Optional[str] = None
202-
node_name: t.Optional[str] = None # dbt node name
202+
dbt_name: t.Optional[str] = None # dbt node name
203203
_path: t.Optional[Path] = None
204204
_data_hash: t.Optional[str] = None
205205
_metadata_hash: t.Optional[str] = None

sqlmesh/core/scheduler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ def _run_or_audit(
812812
run_environment_statements=run_environment_statements,
813813
audit_only=audit_only,
814814
auto_restatement_triggers=auto_restatement_triggers,
815-
selected_models={s.node.node_name for s in merged_intervals if s.node.node_name},
815+
selected_models={s.node.dbt_name for s in merged_intervals if s.node.dbt_name},
816816
)
817817

818818
return CompletionStatus.FAILURE if errors else CompletionStatus.SUCCESS

sqlmesh/dbt/model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ def to_sqlmesh(
689689
extract_dependencies_from_query=False,
690690
allow_partials=allow_partials,
691691
virtual_environment_mode=virtual_environment_mode,
692-
node_name=self.node_name,
692+
dbt_name=self.node_name,
693693
**optional_kwargs,
694694
**model_kwargs,
695695
)

sqlmesh/dbt/seed.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def to_sqlmesh(
9292
audit_definitions=audit_definitions,
9393
virtual_environment_mode=virtual_environment_mode,
9494
start=self.start or context.sqlmesh_config.model_defaults.start,
95-
node_name=self.node_name,
95+
dbt_name=self.node_name,
9696
**kwargs,
9797
)
9898

sqlmesh/migrations/v0097_add_node_name.py renamed to sqlmesh/migrations/v0097_add_dbt_name_in_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""Add 'node_name' property to node definition."""
1+
"""Add 'dbt_name' property to node definition."""
22

33

44
def migrate_schemas(state_sync, **kwargs): # type: ignore

tests/dbt/test_model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ def test_node_name_populated_for_dbt_models(dbt_dummy_postgres_config: PostgresC
652652

653653
# check after convert to SQLMesh model that node_name is populated correctly
654654
sqlmesh_model = model_config.to_sqlmesh(context)
655-
assert sqlmesh_model.node_name == "model.test_package.test_model"
655+
assert sqlmesh_model.dbt_name == "model.test_package.test_model"
656656

657657

658658
@pytest.mark.slow
@@ -709,4 +709,4 @@ def test_load_model_dbt_node_name(tmp_path: Path) -> None:
709709

710710
# Verify that node_name is the equivalent dbt one
711711
model = context.snapshots[model_fqn].model
712-
assert model.node_name == "model.test_project.simple_model"
712+
assert model.dbt_name == "model.test_project.simple_model"

0 commit comments

Comments
 (0)