split model diff and table diff functionality

Author: themisvaltinos

sqlmesh/cli/main.py

@@ -891,27 +891,26 @@ def create_external_models(obj: Context, **kwargs: t.Any) -> None:
     type=str,
     help="Schema used for temporary tables. It can be `CATALOG.SCHEMA` or `SCHEMA`. Default: `sqlmesh_temp`",
 )
+@click.option(
+    "--select-model",
+    type=str,
+    multiple=True,
+    help="Select specific model that should be diffed.",
+)
 @click.pass_obj
 @error_handler
 @cli_analytics
 def table_diff(
     obj: Context, source_to_target: str, model: t.Optional[str], **kwargs: t.Any
 ) -> None:
-    """Show the diff between two tables or all impacted when no model is specified."""
+    """Show the diff between two tables or a selection of models when they are specified."""
     source, target = source_to_target.split(":")
-    if model:
-        obj.table_diff(
-            source=source,
-            target=target,
-            model_or_snapshot=model,
-            **kwargs,
-        )
-    else:
-        obj.table_diff_impacted_models(
-            source=source,
-            target=target,
-            **kwargs,
-        )
+    obj.table_diff(
+        source=source,
+        target=target,
+        model_or_snapshot=model,
+        **kwargs,
+    )
 
 
 @cli.command("rewrite")

sqlmesh/core/console.py

@@ -217,25 +217,15 @@ def show_model_difference_summary(
     ) -> None:
         """Displays a summary of differences for the given models."""
 
-    @abc.abstractmethod
-    def show_impacted_tables_diff(
-        self,
-        table_diffs: t.List[TableDiff],
-        show_sample: bool = True,
-        skip_grain_check: bool = False,
-        temp_schema: t.Optional[str] = None,
-    ) -> None:
-        """Display the table diff between all mismatched tables."""
-
     @abc.abstractmethod
     def show_table_diff(
         self,
-        table_diff: TableDiff,
+        table_diffs: t.List[TableDiff],
         show_sample: bool = True,
         skip_grain_check: bool = False,
         temp_schema: t.Optional[str] = None,
     ) -> None:
-        """Display the table diff between two tables."""
+        """Display the table diff between two or multiple tables."""
 
     @abc.abstractmethod
     def show_table_diff_summary(self, table_diff: TableDiff) -> None:
@@ -668,29 +658,21 @@ def loading_start(self, message: t.Optional[str] = None) -> uuid.UUID:
     def loading_stop(self, id: uuid.UUID) -> None:
         pass
 
-    def show_impacted_tables_diff(
-        self,
-        table_diffs: t.List[TableDiff],
-        show_sample: bool = True,
-        skip_grain_check: bool = False,
-        temp_schema: t.Optional[str] = None,
-    ) -> None:
-        pass
-
     def show_table_diff(
         self,
-        table_diff: TableDiff,
+        table_diffs: t.List[TableDiff],
         show_sample: bool = True,
         skip_grain_check: bool = False,
         temp_schema: t.Optional[str] = None,
     ) -> None:
-        self.show_table_diff_summary(table_diff)
-        self.show_schema_diff(table_diff.schema_diff())
-        self.show_row_diff(
-            table_diff.row_diff(temp_schema=temp_schema, skip_grain_check=skip_grain_check),
-            show_sample=show_sample,
-            skip_grain_check=skip_grain_check,
-        )
+        for table_diff in table_diffs:
+            self.show_table_diff_summary(table_diff)
+            self.show_schema_diff(table_diff.schema_diff())
+            self.show_row_diff(
+                table_diff.row_diff(temp_schema=temp_schema, skip_grain_check=skip_grain_check),
+                show_sample=show_sample,
+                skip_grain_check=skip_grain_check,
+            )
 
     def show_table_diff_summary(self, table_diff: TableDiff) -> None:
         pass
@@ -2158,30 +2140,6 @@ def show_row_diff(
                 self.console.print(row_diff.t_sample.to_string(index=False), end="\n\n")
 
     def show_table_diff(
-        self,
-        table_diff: TableDiff,
-        show_sample: bool = True,
-        skip_grain_check: bool = False,
-        temp_schema: t.Optional[str] = None,
-    ) -> None:
-        """Display the table diff between two tables.
-
-        Args:
-            table_diff: The TableDiff object containing schema and summary differences
-            show_sample: Show the sample dataframe in the console. Requires show=True.
-            skip_grain_check: Skip check for rows that contain null or duplicate grains.
-            temp_schema: The schema to use for temporary tables.
-        """
-
-        self.show_table_diff_summary(table_diff)
-        self.show_schema_diff(table_diff.schema_diff())
-        self.show_row_diff(
-            table_diff.row_diff(temp_schema=temp_schema, skip_grain_check=skip_grain_check),
-            show_sample=show_sample,
-            skip_grain_check=skip_grain_check,
-        )
-
-    def show_impacted_tables_diff(
         self,
         table_diffs: t.List[TableDiff],
         show_sample: bool = True,
@@ -2219,12 +2177,13 @@ def show_impacted_tables_diff(
                     f"[{self.TABLE_DIFF_SOURCE_BLUE}]{m.source}[/{self.TABLE_DIFF_SOURCE_BLUE}] - [{self.TABLE_DIFF_TARGET_GREEN}]{m.target}[/{self.TABLE_DIFF_TARGET_GREEN}]"
                 )
             self._print(m_tree)
-            for diff in mismatched_tables:
-                self.show_table_diff(
-                    table_diff=diff,
+            for table_diff in mismatched_tables:
+                self.show_table_diff_summary(table_diff)
+                self.show_schema_diff(table_diff.schema_diff())
+                self.show_row_diff(
+                    table_diff.row_diff(temp_schema=temp_schema, skip_grain_check=skip_grain_check),
                     show_sample=show_sample,
                     skip_grain_check=skip_grain_check,
-                    temp_schema=temp_schema,
                 )
 
     def print_environments(self, environments_summary: t.Dict[str, int]) -> None:
@@ -2814,6 +2773,53 @@ def show_model_difference_summary(
                 context_diff, modified_snapshots, environment_naming_info, default_catalog, no_diff
             )
 
+    def show_table_diff(
+        self,
+        table_diffs: t.List[TableDiff],
+        show_sample: bool = True,
+        skip_grain_check: bool = False,
+        temp_schema: t.Optional[str] = None,
+    ) -> None:
+        """
+        Display the table diff between all mismatched tables.
+        """
+        mismatched_tables = []
+        fully_matched = []
+        for table_diff in table_diffs:
+            if (
+                table_diff.row_diff(
+                    temp_schema=temp_schema, skip_grain_check=skip_grain_check
+                ).full_match_pct
+                == 100
+            ):
+                fully_matched.append(table_diff)
+            else:
+                mismatched_tables.append(table_diff)
+
+        if fully_matched:
+            m_tree = Tree("\n[b]Identical Tables")
+            for m in fully_matched:
+                m_tree.add(
+                    f"[{self.TABLE_DIFF_SOURCE_BLUE}]{m.source}[/{self.TABLE_DIFF_SOURCE_BLUE}] - [{self.TABLE_DIFF_TARGET_GREEN}]{m.target}[/{self.TABLE_DIFF_TARGET_GREEN}]"
+                )
+            self._print(m_tree)
+
+        if mismatched_tables:
+            m_tree = Tree("\n[b]Mismatched Tables")
+            for m in mismatched_tables:
+                m_tree.add(
+                    f"[{self.TABLE_DIFF_SOURCE_BLUE}]{m.source}[/{self.TABLE_DIFF_SOURCE_BLUE}] - [{self.TABLE_DIFF_TARGET_GREEN}]{m.target}[/{self.TABLE_DIFF_TARGET_GREEN}]"
+                )
+            self._print(m_tree)
+            for table_diff in mismatched_tables:
+                self.show_table_diff_summary(table_diff)
+                self.show_schema_diff(table_diff.schema_diff())
+                self.show_row_diff(
+                    table_diff.row_diff(temp_schema=temp_schema, skip_grain_check=skip_grain_check),
+                    show_sample=show_sample,
+                    skip_grain_check=skip_grain_check,
+                )
+
     def _print_models_with_threshold(
         self,
         environment_naming_info: EnvironmentNamingInfo,