fix tests

Author: vvkh

data_diff/format.py

@@ -29,7 +29,7 @@ def jsonify_error(table1: List[str], table2: List[str], dbt_model: str, error: s
         error=error,
     ).json()
 
-Columns = List[Tuple[str, str, Type[ColType]]] 
+Columns = List[Tuple[str, str, ColType]] 
 
 def jsonify(
     diff: DiffResultWrapper,
@@ -335,7 +335,7 @@ def _jsonify_columns_diff(dataset1_columns: Columns,
         typeChanged=list(columns_diff.get("changed", [])),
     )
 
-def _map_kind(kind: Type[ColType]) -> ColumnKind:
+def _map_kind(kind: ColType) -> ColumnKind:
     for raw_kind, json_kind in KIND_MAPPING:
         if isinstance(kind, raw_kind):
             return json_kind

tests/test_format.py

@@ -1,6 +1,7 @@
 import unittest
 from data_diff.diff_tables import DiffResultWrapper, InfoTree, SegmentInfo, TableSegment
 from data_diff.format import jsonify
+from data_diff.sqeleton.abcs.database_types import Integer
 from data_diff.sqeleton.databases import Database
 
 
@@ -38,14 +39,14 @@ def test_jsonify_diff(self):
         json_diff = jsonify(
             diff, 
             dbt_model="my_model", 
-            dataset1_columns={
-                "id": ('id', 'integer', None, None, None),
-                "value": ('value', 'integer', None, None, None),
-            }, 
-            dataset2_columns={
-                "id": ('id', 'integer', None, None, None),
-                "value": ('value', 'integer', None, None, None),
-            },
+            dataset1_columns=[
+                ('id', 'NUMBER', Integer()),
+                ('value', 'NUMBER', Integer()),
+            ], 
+            dataset2_columns=[
+                ('id', 'NUMBER', Integer()),
+                ('value', 'NUMBER', Integer()),
+            ],
             columns_diff={
                 "added": [],
                 "removed": [],
@@ -76,12 +77,12 @@ def test_jsonify_diff(self):
                 },
                 "columns": {
                     "dataset1": [
-                        {"name": "id", "type": "integer"},
-                        {"name": "value", "type": "integer"}
+                        {"name": "id", "type": "NUMBER", "kind": "integer"},
+                        {"name": "value", "type": "NUMBER", "kind": "integer"}
                     ],
                     "dataset2": [
-                        {"name": "id", "type": "integer"},
-                        {"name": "value", "type": "integer"}
+                        {"name": "id", "type": "NUMBER", "kind": "integer"},
+                        {"name": "value", "type": "NUMBER", "kind": "integer"}
                     ],
                     "primaryKey": ["id"],
                     "exclusive": {
@@ -121,14 +122,14 @@ def test_jsonify_diff_no_difeference(self):
         json_diff = jsonify(
             diff, 
             dbt_model="model", 
-            dataset1_columns={
-                "id": ('id', 'integer', None, None, None),
-                "value": ('value', 'integer', None, None, None),
-            }, 
-            dataset2_columns={
-                "id": ('id', 'integer', None, None, None),
-                "value": ('value', 'integer', None, None, None),
-            },
+            dataset1_columns=[
+                ('id', 'NUMBER', Integer()),
+                ('value', 'NUMBER', Integer()),
+            ], 
+            dataset2_columns=[
+                ('id', 'NUMBER', Integer()),
+                ('value', 'NUMBER', Integer()),
+            ],
             columns_diff={
                 "added": [],
                 "removed": [],
@@ -151,12 +152,12 @@ def test_jsonify_diff_no_difeference(self):
                 "columns": {
                     "primaryKey": ["id"],
                     "dataset1": [
-                        {"name": "id", "type": "integer"},
-                        {"name": "value", "type": "integer"}
+                        {"name": "id", "type": "NUMBER", "kind": "integer"},
+                        {"name": "value", "type": "NUMBER", "kind": "integer"}
                     ],
                     "dataset2": [
-                        {"name": "id", "type": "integer"},
-                        {"name": "value", "type": "integer"}
+                        {"name": "id", "type": "NUMBER", "kind": "integer"},
+                        {"name": "value", "type": "NUMBER", "kind": "integer"}
                     ],
                     "exclusive": {
                         "dataset1": [],
@@ -196,11 +197,27 @@ def test_jsonify_column_suffix_fix(self):
             diff=[],
             stats={},
         )
-        json_diff = jsonify(diff, dbt_model="my_model")
+        json_diff = jsonify(
+            diff, 
+            dbt_model="my_model",
+            dataset1_columns=[
+                ('id_a', 'NUMBER', Integer()),
+                ('value_b', 'NUMBER', Integer()),
+            ], 
+            dataset2_columns=[
+                ('id_a', 'NUMBER', Integer()),
+                ('value_b', 'NUMBER', Integer()),
+            ],
+            columns_diff={
+                "added": [],
+                "removed": [],
+                "typeChanged": [],
+            },
+        )
         self.assertEqual(
             json_diff,
             {
-                "version": "1.0.0",
+                "version": "1.1.0",
                 "status": "success",
                 "result": "different",
                 "model": "my_model",
@@ -221,6 +238,21 @@ def test_jsonify_column_suffix_fix(self):
                     ],
                 },
                 "summary": None,
-                "columns": None,
+                "columns": {
+                    "dataset1": [
+                        {"name": "id_a", "type": "NUMBER", "kind": "integer"},
+                        {"name": "value_b", "type": "NUMBER", "kind": "integer"}
+                    ],
+                    "dataset2": [
+                        {"name": "id_a", "type": "NUMBER", "kind": "integer"},
+                        {"name": "value_b", "type": "NUMBER", "kind": "integer"}
+                    ],
+                    "primaryKey": ["id_a"],
+                    "exclusive": {
+                        "dataset1": [],
+                        "dataset2": [],
+                    },
+                    "typeChanged": [],
+                },
             },
         )