Refactor; extend test for dicts

Author: themisvaltinos

sqlmesh/core/console.py

@@ -1905,32 +1905,10 @@ def show_row_diff(
                     # Create a table with the joined keys and comparison columns
                     column_table = row_diff.joined_sample[keys + [source_column, target_column]]
 
-                    def compare_cells(x: t.Any, y: t.Any) -> bool:
-                        """Compare two cells and returns true if they're not equal, handling array objects."""
-                        if x is None or y is None:
-                            return x != y
-
-                        # Convert any array-like object to list for consistent comparison
-                        def to_list(val: t.Any) -> t.Any:
-                            return (
-                                list(val)
-                                if isinstance(val, (pd.Series, np.ndarray, list, tuple, set))
-                                else val
-                            )
-
-                        x = to_list(x)
-                        y = to_list(y)
-                        if isinstance(x, list) and isinstance(y, list):
-                            if len(x) != len(y):
-                                return True
-                            return any(a != b for a, b in zip(x, y))
-
-                        return x != y
-
                     # Filter to retain non identical-valued rows
                     column_table = column_table[
                         column_table.apply(
-                            lambda row: compare_cells(row[source_column], row[target_column]),
+                            lambda row: _compare_df_cells(row[source_column], row[target_column]),
                             axis=1,
                         )
                     ]
@@ -2064,6 +2042,25 @@ def show_linter_violations(
             self.log_warning(msg)
 
 
+def _compare_df_cells(x: t.Any, y: t.Any) -> bool:
+    """Helper function to compare two cells and returns true if they're not equal, handling array objects."""
+    if x is None or y is None:
+        return x != y
+
+    # Convert any array-like object to list for consistent comparison
+    def to_list(val: t.Any) -> t.Any:
+        return list(val) if isinstance(val, (pd.Series, np.ndarray, list, tuple, set)) else val
+
+    x = to_list(x)
+    y = to_list(y)
+    if isinstance(x, list) and isinstance(y, list):
+        if len(x) != len(y):
+            return True
+        return any(a != b for a, b in zip(x, y))
+
+    return x != y
+
+
 def add_to_layout_widget(target_widget: LayoutWidget, *widgets: widgets.Widget) -> LayoutWidget:
     """Helper function to add a widget to a layout widget.
 

tests/core/test_table_diff.py

@@ -431,7 +431,7 @@ def test_tables_and_grain_inferred_from_model(sushi_context_fixed_date: Context)
 
 
 @pytest.mark.slow
-def test_data_diff_array(sushi_context_fixed_date):
+def test_data_diff_array_dict(sushi_context_fixed_date):
     engine_adapter = sushi_context_fixed_date.engine_adapter
 
     engine_adapter.ctas(
@@ -440,6 +440,7 @@ def test_data_diff_array(sushi_context_fixed_date):
             {
                 "key": [1, 2, 3],
                 "value": [np.array([51.2, 4.5678]), np.array([2.31, 12.2]), np.array([5.0])],
+                "dict": [{"key1": 10, "key2": 20, "key3": 30}, {"key1": 10}, {}],
             }
         ),
     )
@@ -454,6 +455,7 @@ def test_data_diff_array(sushi_context_fixed_date):
                     np.array([2.31, 12.2, 3.6, 1.9]),
                     np.array([5.0]),
                 ],
+                "dict": [{"key1": 10, "key2": 13}, {"key1": 10}, {}],
             }
         ),
     )
@@ -487,6 +489,7 @@ def test_data_diff_array(sushi_context_fixed_date):
 COMMON ROWS column comparison stats:
        pct_match
 value  33.333333
+dict   66.666667
 
 
 COMMON ROWS sample data differences:
@@ -497,6 +500,12 @@ def test_data_diff_array(sushi_context_fixed_date):
 │ 1   │ [51.2, 4.5678] │ [51.2, 4.5679]         │
 │ 2   │ [2.31, 12.2]   │ [2.31, 12.2, 3.6, 1.9] │
 └─────┴────────────────┴────────────────────────┘
+Column: dict
+┏━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━┓
+┃ key ┃ DEV                         ┃ PROD               ┃
+┡━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━┩
+│ 1   │ {key1=10, key2=20, key3=30} │ {key1=10, key2=13} │
+└─────┴─────────────────────────────┴────────────────────┘
 """
 
     stripped_output = strip_ansi_codes(output)