Merge branch 'main' into joe/574-add-python-314-non-free-threaded-build-support

Author: joe-clickhouse

CHANGELOG.md

@@ -24,6 +24,7 @@ The supported method of passing ClickHouse server settings is to prefix such arg
 ## UNRELEASED
 
 ### Bug Fixes
+- Fixed DST fallback bug in DateTime and DateTime64 types caused by passing potentially ambiguous times to pd.DateTimeIndex constructor.
 - Fixed issue with JSON key dot escaping. Closes [#571](https://github.com/ClickHouse/clickhouse-connect/issues/571)
 
 ### Improvements

CONTRIBUTING.md

@@ -116,7 +116,7 @@ These tests require the `CLICKHOUSE_CONNECT_TEST_TLS` environment variable to be
 Additionally, the TLS ClickHouse instance should be running (see [docker-compose.yml](docker-compose.yml)).
 
 ```bash
-CLICKHOUSE_CONNECT_TEST_TLS=1 pytest tests/tls
+CLICKHOUSE_CONNECT_TEST_TLS=1 pytest tests/integration_tests/test_tls.py
 ```
 
 ### Running the integration tests with ClickHouse Cloud

clickhouse_connect/common.py

@@ -2,13 +2,12 @@
 import sys
 from dataclasses import dataclass
 from typing import Any, Sequence, Optional, Dict
-from clickhouse_connect import __version__
-
 
+from clickhouse_connect import __version__
 from clickhouse_connect.driver.exceptions import ProgrammingError
 
 
-def version():
+def version() -> str:
     return __version__.version
 
 
@@ -30,7 +29,7 @@ class CommonSetting:
 _common_settings: Dict[str, CommonSetting] = {}
 
 
-def build_client_name(client_name: str):
+def build_client_name(client_name: str) -> str:
     product_name = get_setting('product_name')
     product_name = product_name.strip() + ' ' if product_name else ''
     client_name = client_name.strip() + ' ' if client_name else ''
@@ -46,14 +45,14 @@ def build_client_name(client_name: str):
     return full_name.encode('ascii', 'ignore').decode()
 
 
-def get_setting(name: str):
+def get_setting(name: str) -> Any:
     setting = _common_settings.get(name)
     if setting is None:
         raise ProgrammingError(f'Unrecognized common setting {name}')
     return setting.value if setting.value is not None else setting.default
 
 
-def set_setting(name: str, value: Any):
+def set_setting(name: str, value: Any) -> None:
     setting = _common_settings.get(name)
     if setting is None:
         raise ProgrammingError(f'Unrecognized common setting {name}')
@@ -65,7 +64,7 @@ def set_setting(name: str, value: Any):
         setting.value = value
 
 
-def _init_common(name: str, options: Sequence[Any], default: Any):
+def _init_common(name: str, options: Sequence[Any], default: Any) -> None:
     _common_settings[name] = CommonSetting(name, options, default)
 
 

clickhouse_connect/datatypes/temporal.py

@@ -89,8 +89,8 @@ def _finalize_column(self, column: Sequence, ctx: QueryContext) -> Sequence:
                 if column.tz is None:
                     return column.astype(self.pandas_dtype)
 
-                naive = column.tz_localize(None).astype(self.pandas_dtype)
-                return pd.DatetimeIndex(naive, tz=column.tz)
+                naive = column.tz_convert("UTC").tz_localize(None).astype(self.pandas_dtype)
+                return naive.tz_localize("UTC").tz_convert(column.tz)
 
             if self.nullable and isinstance(column, list):
                 return np.array([None if pd.isna(s) else s for s in column]).astype(
@@ -159,8 +159,8 @@ def _finalize_column(self, column: Sequence, ctx: QueryContext) -> Sequence:
                     result = column.astype(self.pandas_dtype)
                     return pd.array(result) if self.nullable else result
 
-                naive_ns = column.tz_localize(None).astype(self.pandas_dtype)
-                tz_aware_result = pd.DatetimeIndex(naive_ns, tz=column.tz)
+                naive_ns = column.tz_convert("UTC").tz_localize(None).astype(self.pandas_dtype)
+                tz_aware_result = naive_ns.tz_localize("UTC").tz_convert(column.tz)
                 return (
                     pd.array(tz_aware_result) if self.nullable else tz_aware_result
                 )

clickhouse_connect/driver/__init__.py

@@ -146,7 +146,7 @@ async def create_async_client(*,
                               dsn: Optional[str] = None,
                               settings: Optional[Dict[str, Any]] = None,
                               generic_args: Optional[Dict[str, Any]] = None,
-                              executor_threads: Optional[int] = None,
+                              executor_threads: int = 0,
                               **kwargs) -> AsyncClient:
     """
     The preferred method to get an async ClickHouse Connect Client instance.
@@ -168,7 +168,7 @@ async def create_async_client(*,
     :param settings: ClickHouse server settings to be used with the session/every request
     :param generic_args: Used internally to parse DBAPI connection strings into keyword arguments and ClickHouse settings.
       It is not recommended to use this parameter externally
-    :param: executor_threads 'max_worker' threads used by the client ThreadPoolExecutor.  If not set, the default
+    :param executor_threads: 'max_worker' threads used by the client ThreadPoolExecutor.  If not set, the default
       of 4 + detected CPU cores will be used
     :param kwargs -- Recognized keyword arguments (used by the HTTP client), see below