Skip to content

Commit 90a0b45

Browse files
committed
fix(clickhouse): initialize virtual catalog for cleanup
Signed-off-by: mday-io <mdaytn@gmail.com>
1 parent 056262b commit 90a0b45

2 files changed

Lines changed: 57 additions & 0 deletions

File tree

‎sqlmesh/core/context.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3066,6 +3066,9 @@ def _cleanup_environments(
30663066
f"Environment '{name}' is not expired or does not exist. Nothing to clean up."
30673067
)
30683068

3069+
if expired_environments_summaries:
3070+
self._ensure_virtual_catalog_injection()
3071+
30693072
for expired_env_summary in expired_environments_summaries:
30703073
expired_env = self.state_reader.get_environment(expired_env_summary.name)
30713074

‎tests/core/test_context.py‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
from sqlmesh.core.model import load_sql_based_model, model, SqlModel, Model
4242
from sqlmesh.core.model.common import ParsableSql
4343
from sqlmesh.core.model.cache import OptimizedQueryCache
44+
from sqlmesh.core.snapshot import SnapshotChangeCategory
4445
from sqlmesh.core.renderer import render_statements
4546
from sqlmesh.core.model.kind import ModelKindName
4647
from sqlmesh.core.state_sync.cache import CachingStateSync
@@ -561,6 +562,59 @@ def test_snapshot_evaluator_calls_ensure_virtual_catalog_injection(mocker):
561562
inject_spy.assert_called_once()
562563

563564

565+
@pytest.mark.fast
566+
def test_cleanup_environments_initializes_virtual_catalog(
567+
mocker: MockerFixture, make_mocked_engine_adapter: t.Callable, make_snapshot: t.Callable
568+
):
569+
"""Cleanup-only contexts must inject ClickHouse's virtual catalog before dropping views."""
570+
from sqlmesh.core.engine_adapter.clickhouse import ClickhouseEngineAdapter
571+
572+
duck_adapter = make_mocked_engine_adapter(
573+
DuckDBEngineAdapter,
574+
default_catalog="main",
575+
)
576+
clickhouse_adapter = make_mocked_engine_adapter(ClickhouseEngineAdapter)
577+
578+
context = Context(config=Config(), load=False)
579+
context._engine_adapter = duck_adapter
580+
context.engine_adapters = {
581+
"duckdb_gw": duck_adapter,
582+
"clickhouse_gw": clickhouse_adapter,
583+
}
584+
585+
snapshot = make_snapshot(
586+
SqlModel(
587+
name="__clickhouse_gw__.my_db.connection_test",
588+
query=parse_one("SELECT 1 AS id", dialect="clickhouse"),
589+
gateway="clickhouse_gw",
590+
dialect="clickhouse",
591+
)
592+
)
593+
snapshot.categorize_as(SnapshotChangeCategory.BREAKING)
594+
environment = Environment(
595+
name="dev",
596+
suffix_target=EnvironmentSuffixTarget.TABLE,
597+
snapshots=[snapshot.table_info],
598+
start_at="2024-01-01",
599+
end_at="2024-01-01",
600+
plan_id="test_plan_id",
601+
previous_plan_id="test_plan_id",
602+
gateway_managed=True,
603+
)
604+
605+
state_sync = mocker.MagicMock()
606+
state_sync.get_expired_environments.return_value = [mocker.Mock(name="dev")]
607+
state_sync.get_expired_environments.return_value[0].name = "dev"
608+
state_sync.get_environment.return_value = environment
609+
context._state_sync = state_sync
610+
611+
assert context._cleanup_environments(name="dev") == []
612+
assert clickhouse_adapter._default_catalog == "__clickhouse_gw__"
613+
clickhouse_adapter.cursor.execute.assert_called_once_with(
614+
'DROP VIEW IF EXISTS "my_db"."connection_test__dev"'
615+
)
616+
617+
564618
@pytest.mark.fast
565619
def test_multi_gateway_virtual_catalog_create_schema_strips_prefix(tmp_path: Path, mocker):
566620
"""Integration test: create_schema with a 3-level virtual-catalog FQN must strip the synthetic

0 commit comments

Comments
 (0)