Skip to content

Fix: display_name should not exclude the default catalog when environment_suffix_target is set to CATALOG #4821

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
erindru merged 1 commit into from
Jun 26, 2025
Merged

Fix: display_name should not exclude the default catalog when environment_suffix_target is set to CATALOG #4821

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
17 changes: 12 additions & 5 deletions sqlmesh/core/snapshot/definition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

from sqlmesh.core import constants as c
from sqlmesh.core.audit import StandaloneAudit
from sqlmesh.core.environment import EnvironmentSuffixTarget
from sqlmesh.core.macros import call_macro
from sqlmesh.core.model import Model, ModelKindMixin, ModelKindName, ViewKind, CustomKind
from sqlmesh.core.model.definition import _Model
Expand Down Expand Up @@ -1589,12 +1590,18 @@ def display_name(
if snapshot_info_like.is_audit:
return snapshot_info_like.name
view_name = exp.to_table(snapshot_info_like.name)

catalog = (
None
if (
environment_naming_info.suffix_target != EnvironmentSuffixTarget.CATALOG
and view_name.catalog == default_catalog
)
else view_name.catalog
)

qvn = QualifiedViewName(
catalog=(
view_name.catalog
if view_name.catalog and view_name.catalog != default_catalog
else None
),
catalog=catalog,
schema_name=view_name.db or None,
table=view_name.name,
)
Expand Down
15 changes: 15 additions & 0 deletions tests/core/test_snapshot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2178,6 +2178,21 @@ def test_deployability_index_missing_parent(make_snapshot):
"snowflake",
"CATALOG_OVERRIDE.test_db.test_model__DEV",
),
# EnvironmentSuffixTarget.CATALOG
(
"test_db.test_model",
EnvironmentNamingInfo(name="dev", suffix_target=EnvironmentSuffixTarget.CATALOG),
"default_catalog",
"duckdb",
"default_catalog__dev.test_db.test_model",
),
(
"test_db.test_model",
EnvironmentNamingInfo(name="dev", suffix_target=EnvironmentSuffixTarget.CATALOG),
"default_catalog",
"snowflake",
"DEFAULT_CATALOG__DEV.test_db.test_model",
),
),
)
def test_display_name(
Expand Down