Adjustments

Author: erezsh

data_diff/databases/clickhouse.py

@@ -62,15 +62,14 @@ def cursor(self, cursor_factory=None):
                 return self.cursors[0]
 
         try:
-            connection = SingleConnection(**self._args)
-            return connection
+            return SingleConnection(**self._args)
         except clickhouse.OperationError as e:
             raise ConnectError(*e.args) from e
 
     def _parse_type_repr(self, type_repr: str) -> Optional[Type[ColType]]:
         nullable_prefix = "Nullable("
         if type_repr.startswith(nullable_prefix):
-            type_repr = type_repr.replace("Nullable(", "").rstrip(")")
+            type_repr = type_repr[len(nullable_prefix):].rstrip(")")
 
         if type_repr.startswith("Decimal"):
             type_repr = "Decimal"

data_diff/table_segment.py

@@ -218,7 +218,7 @@ def count_and_checksum(self) -> Tuple[int, int]:
 
         if count:
             assert checksum, (count, checksum)
-        return count or 0, None if not checksum else int(checksum)
+        return count or 0, int(checksum) if count else None
 
     def query_key_range(self) -> Tuple[int, int]:
         """Query database for minimum and maximum key. This is used for setting the initial bounds."""

tests/common.py

@@ -21,7 +21,7 @@
 TEST_ORACLE_CONN_STRING: str = None
 TEST_DATABRICKS_CONN_STRING: str = os.environ.get("DATADIFF_DATABRICKS_URI")
 TEST_TRINO_CONN_STRING: str = os.environ.get("DATADIFF_TRINO_URI") or None
-TEST_CLICKHOUSE_CONN_STRING: str = "clickhouse://clickhouse:Password1@localhost:9000/clickhouse"
+TEST_CLICKHOUSE_CONN_STRING: str = None     # "clickhouse://clickhouse:Password1@localhost:9000/clickhouse"
 
 DEFAULT_N_SAMPLES = 50
 N_SAMPLES = int(os.environ.get("N_SAMPLES", DEFAULT_N_SAMPLES))