not expose in the public api protectprod; remove backup state tables

Author: themisvaltinos

sqlmesh/core/context.py

@@ -1567,9 +1567,7 @@ def apply(
         )
 
     @python_api_analytics
-    def invalidate_environment(
-        self, name: str, sync: bool = False, protect_prod: t.Optional[bool] = True
-    ) -> None:
+    def invalidate_environment(self, name: str, sync: bool = False) -> None:
         """Invalidates the target environment by setting its expiration timestamp to now.
 
         Args:
@@ -1579,7 +1577,7 @@ def invalidate_environment(
             protect_prod: If True, prevents invalidation of the production environment.
         """
         name = Environment.sanitize_name(name)
-        self.state_sync.invalidate_environment(name, protect_prod)
+        self.state_sync.invalidate_environment(name)
         if sync:
             self._cleanup_environments()
             self.console.log_success(f"Environment '{name}' deleted.")
@@ -2556,13 +2554,14 @@ def _context_diff(
     def _destroy(self) -> None:
         # Invalidate all environments, including prod
         for environment in self.state_reader.get_environments():
-            self.invalidate_environment(name=environment.name, protect_prod=False)
+            self.state_sync.invalidate_environment(name=environment.name, protect_prod=False)
+            self.console.log_success(f"Environment '{environment.name}' invalidated.")
 
         # Run janitor to clean up all objects
         self._run_janitor(ignore_ttl=True)
 
-        # Remove state tables
-        self.state_sync.remove_state()
+        # Remove state tables, including backup tables
+        self.state_sync.remove_state(including_backup=True)
         self.console.log_status_update("State tables removed.")
 
         # Finally clear caches

sqlmesh/core/state_sync/base.py

@@ -347,7 +347,7 @@ def delete_expired_snapshots(
         """
 
     @abc.abstractmethod
-    def invalidate_environment(self, name: str, protect_prod: t.Optional[bool] = True) -> None:
+    def invalidate_environment(self, name: str, protect_prod: bool = True) -> None:
         """Invalidates the target environment by setting its expiration timestamp to now.
 
         Args:
@@ -356,7 +356,7 @@ def invalidate_environment(self, name: str, protect_prod: t.Optional[bool] = Tru
         """
 
     @abc.abstractmethod
-    def remove_state(self) -> None:
+    def remove_state(self, including_backup: bool = False) -> None:
         """Removes the state store objects."""
 
     @abc.abstractmethod

sqlmesh/core/state_sync/db/environment.py

@@ -108,7 +108,7 @@ def update_environment_statements(
                 columns_to_types=self._environment_statements_columns_to_types,
             )
 
-    def invalidate_environment(self, name: str, protect_prod: t.Optional[bool] = True) -> None:
+    def invalidate_environment(self, name: str, protect_prod: bool = True) -> None:
         """Invalidates the environment.
 
         Args:

sqlmesh/core/state_sync/db/facade.py

@@ -59,7 +59,7 @@
 from sqlmesh.core.state_sync.db.environment import EnvironmentState
 from sqlmesh.core.state_sync.db.snapshot import SnapshotState
 from sqlmesh.core.state_sync.db.version import VersionState
-from sqlmesh.core.state_sync.db.migrator import StateMigrator
+from sqlmesh.core.state_sync.db.migrator import StateMigrator, _backup_table_name
 from sqlmesh.utils.date import TimeLike, to_timestamp, time_like_to_str, now_timestamp
 from sqlmesh.utils.errors import ConflictingPlanError, SQLMeshError
 
@@ -270,7 +270,7 @@ def unpause_snapshots(
     ) -> None:
         self.snapshot_state.unpause_snapshots(snapshots, unpaused_dt, self.interval_state)
 
-    def invalidate_environment(self, name: str, protect_prod: t.Optional[bool] = True) -> None:
+    def invalidate_environment(self, name: str, protect_prod: bool = True) -> None:
         self.environment_state.invalidate_environment(name, protect_prod)
 
     def get_expired_snapshots(
@@ -313,7 +313,7 @@ def snapshots_exist(self, snapshot_ids: t.Iterable[SnapshotIdLike]) -> t.Set[Sna
     def nodes_exist(self, names: t.Iterable[str], exclude_external: bool = False) -> t.Set[str]:
         return self.snapshot_state.nodes_exist(names, exclude_external)
 
-    def remove_state(self) -> None:
+    def remove_state(self, including_backup: bool = False) -> None:
         """Removes the state store objects."""
         for table in (
             self.snapshot_state.snapshots_table,
@@ -325,6 +325,9 @@ def remove_state(self) -> None:
             self.version_state.versions_table,
         ):
             self.engine_adapter.drop_table(table)
+            if including_backup:
+                self.engine_adapter.drop_table(_backup_table_name(table))
+
         self.snapshot_state.clear_cache()
 
     def reset(self, default_catalog: t.Optional[str]) -> None:

tests/integrations/github/cicd/test_github_controller.py

@@ -437,7 +437,7 @@ def test_try_invalidate_pr_environment(github_client, make_controller, mocker: M
     invalidate_controller._context._state_sync = mocker.MagicMock()
     invalidate_controller.try_invalidate_pr_environment()
     invalidate_controller._context._state_sync.invalidate_environment.assert_called_once_with(
-        "hello_world_2", True
+        "hello_world_2"
     )
 
     no_invalidate_controller = make_controller(