Docker test fixes (ClickHouse#473)

* Don't prevent settings that don't change the value

* Add docker related config file

* Fix typo

Author: genzgd

.docker/clickhouse/single_node/config.xml

@@ -1,20 +1,16 @@
 <?xml version="1.0"?>
 <clickhouse>
 
-    <http_port>8123</http_port>
-    <tcp_port>9000</tcp_port>
-
-    <users_config>users.xml</users_config>
     <default_profile>default</default_profile>
     <default_database>default</default_database>
-
     <mark_cache_size>5368709120</mark_cache_size>
 
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
     <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
     <access_control_path>/var/lib/clickhouse/access/</access_control_path>
     <keep_alive_timeout>3</keep_alive_timeout>
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
 
     <logger>
         <level>warning</level>
@@ -37,5 +33,11 @@
         <table>session_log</table>
     </session_log>
 
+    <user_directories>
+        <users_xml>
+            <path>users.xml</path>
+        </users_xml>
+    </user_directories>
+
     <custom_settings_prefixes>SQL_</custom_settings_prefixes>
 </clickhouse>

.docker/clickhouse/single_node/docker_related_config.xml

@@ -0,0 +1,5 @@
+<clickhouse>
+    <listen_host>0.0.0.0</listen_host>
+    <http_port>8123</http_port>
+    <tcp_port>9000</tcp_port>
+</clickhouse>

.docker/clickhouse/single_node_tls/Dockerfile

@@ -1,4 +1,4 @@
-FROM clickhouse/clickhouse-server:24.8-alpine
+FROM clickhouse/clickhouse-server:25.1-alpine
 COPY .docker/clickhouse/single_node_tls/certificates /etc/clickhouse-server/certs
 RUN chown clickhouse:clickhouse -R /etc/clickhouse-server/certs \
     && chmod 600 /etc/clickhouse-server/certs/* \

.docker/clickhouse/single_node_tls/config.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
 <clickhouse>
 
-    <https_port>8443</https_port>
-    <tcp_port_secure>9440</tcp_port_secure>
-    <listen_host>0.0.0.0</listen_host>
-
-    <users_config>users.xml</users_config>
     <default_profile>default</default_profile>
     <default_database>default</default_database>
 
@@ -15,6 +10,7 @@
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
     <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
     <access_control_path>/var/lib/clickhouse/access/</access_control_path>
+    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
 
     <logger>
         <level>warning</level>
@@ -45,4 +41,10 @@
     </query_log>
 
     <custom_settings_prefixes>SQL_</custom_settings_prefixes>
+
+    <user_directories>
+        <users_xml>
+            <path>users.xml</path>
+        </users_xml>
+    </user_directories>
 </clickhouse>

.docker/clickhouse/single_node_tls/docker_related_config.xml

@@ -0,0 +1,5 @@
+<clickhouse>
+    <listen_host>0.0.0.0</listen_host>
+    <https_port>8443</https_port>
+    <tcp_port_secure>9440</tcp_port_secure>
+</clickhouse>

docker-compose.yml

@@ -12,21 +12,3 @@ services:
         hard: 262144
     volumes:
       - /mnt/timeplusd:/var/lib/timeplusd
-
-  clickhouse_tls:
-    build:
-      context: ./
-      dockerfile: .docker/clickhouse/single_node_tls/Dockerfile
-    container_name: "clickhouse-connect-clickhouse-server-tls"
-    environment:
-      CLICKHOUSE_SKIP_USER_SETUP: 1
-    ports:
-      - "10843:8443"
-      - "10840:9440"
-    ulimits:
-      nofile:
-        soft: 262144
-        hard: 262144
-    volumes:
-      - "./.docker/clickhouse/single_node_tls/config.xml:/etc/clickhouse-server/config.xml"
-      - "./.docker/clickhouse/single_node_tls/users.xml:/etc/clickhouse-server/users.xml"

tests/integration_tests/test_dynamic.py

@@ -162,3 +162,7 @@ def test_json_str_time(test_client: Client):
         pytest.skip('JSON string/numbers bug before 25.1, skipping')
     result = test_client.query("SELECT '{\"timerange\": \"2025-01-01T00:00:00+0000\"}'::JSON").result_set
     assert result[0][0]['timerange'] == datetime.datetime(2025, 1, 1)
+
+    # The following query is broken -- looks like something to do with Nullable(String) in the Tuple
+    # result = test_client.query("SELECT'{\"k\": [123, \"xyz\"]}'::JSON",
+    #                           settings={'input_format_json_read_numbers_as_strings': 0}).result_set

timeplus_connect/driver/client.py

@@ -122,9 +122,14 @@ def _validate_settings(self, settings: Optional[Dict[str, Any]]) -> Dict[str, st
         return validated
 
     def _validate_setting(self, key: str, value: Any, invalid_action: str) -> Optional[str]:
+        new_value = str(value)
+        if value is True:
+            new_value = '1'
+        elif value is False:
+            new_value = '0'
         if key not in self.valid_transport_settings:
             setting_def = self.server_settings.get(key)
-            if setting_def is None or setting_def.readonly:
+            if setting_def is None or (setting_def.readonly and setting_def.value != new_value):
                 if key in self.optional_transport_settings:
                     return None
                 if invalid_action == 'send':
@@ -134,9 +139,7 @@ def _validate_setting(self, key: str, value: Any, invalid_action: str) -> Option
                     return None
                 else:
                     raise ProgrammingError(f'Setting {key} is unknown or readonly') from None
-        if isinstance(value, bool):
-            return '1' if value else '0'
-        return str(value)
+        return new_value
 
     def _setting_status(self, key: str) -> SettingStatus:
         comp_setting = self.server_settings.get(key)