PR feedback

Author: georgesittas

sqlmesh/core/console.py

@@ -498,13 +498,9 @@ def stop_env_migration_progress(self, success: bool = True) -> None:
         """Stop the environment migration progress."""
 
     @abc.abstractmethod
-    def log_pre_check_warnings(
-        self,
-        pre_check_warnings: t.List[t.Tuple[str, t.List[str]]],
-        pre_check_only: bool,
-    ) -> bool:
+    def log_pre_check_warnings(self, pre_check_warnings: t.List[str], pre_check_only: bool) -> bool:
         """
-        Log warnings emitted by pre-check scripts and ask user whether they'd like to
+        Log warnings emitted by pre-checks and ask user whether they'd like to
         proceed with the migration (true) or not (false).
         """
 
@@ -673,11 +669,7 @@ def update_env_migration_progress(self, num_tasks: int) -> None:
     def stop_env_migration_progress(self, success: bool = True) -> None:
         pass
 
-    def log_pre_check_warnings(
-        self,
-        pre_check_warnings: t.List[t.Tuple[str, t.List[str]]],
-        pre_check_only: bool,
-    ) -> bool:
+    def log_pre_check_warnings(self, pre_check_warnings: t.List[str], pre_check_only: bool) -> bool:
         return True
 
     def start_state_export(
@@ -1490,16 +1482,11 @@ def stop_env_migration_progress(self, success: bool = True) -> None:
             if success:
                 self.log_success("Environments migrated successfully")
 
-    def log_pre_check_warnings(
-        self,
-        pre_check_warnings: t.List[t.Tuple[str, t.List[str]]],
-        pre_check_only: bool,
-    ) -> bool:
+    def log_pre_check_warnings(self, pre_check_warnings: t.List[str], pre_check_only: bool) -> bool:
         if pre_check_warnings:
-            for pre_check, warnings in pre_check_warnings:
-                tree = Tree(f"[bold]Pre-migration warnings for {pre_check}[/bold]")
-                for warning in warnings:
-                    tree.add(f"[yellow]{warning}[/yellow]")
+            tree = Tree(f"[bold]Pre-migration warnings[/bold]")
+            for warning in pre_check_warnings:
+                tree.add(f"[yellow]{warning}[/yellow]")
 
                 self._print(tree)
 

sqlmesh/core/state_sync/db/migrator.py

@@ -165,7 +165,7 @@ def rollback(self) -> None:
 
         logger.info("Migration rollback successful.")
 
-    def _run_pre_checks(self, state_sync: StateSync) -> t.List[t.Tuple[str, t.List[str]]]:
+    def _run_pre_checks(self, state_sync: StateSync) -> t.List[str]:
         """Run pre-checks for migrations between specified versions.
 
         Args:
@@ -185,7 +185,7 @@ def _run_pre_checks(self, state_sync: StateSync) -> t.List[t.Tuple[str, t.List[s
                 logger.info(f"Running pre-check for {migration_name}")
                 warnings = pre_check(state_sync)
                 if warnings:
-                    pre_check_warnings.append((migration_name, warnings))
+                    pre_check_warnings.extend(warnings)
 
         return pre_check_warnings
 

tests/core/state_sync/test_state_sync.py

@@ -3691,11 +3691,8 @@ def mock_pre_check_without_warnings(state_sync):
         assert len(calls) == 1
 
         pre_check_warnings = calls[0].args[0]
-        assert len(pre_check_warnings) == 1
-
-        assert pre_check_warnings[0][0] == "v9999_test_pre_check"
-        assert len(pre_check_warnings[0][1]) == 3
-        assert all(warning.startswith("Warning:") for warning in pre_check_warnings[0][1])
+        assert len(pre_check_warnings) == 3
+        assert all(warning.startswith("Warning:") for warning in pre_check_warnings)
 
         assert context.state_sync.get_versions() == versions_before_migrate