clickhouse-driver 0.2.6__cp310-cp310-macosx_11_0_arm64.whl → 0.2.7__cp310-cp310-macosx_11_0_arm64.whl

clickhouse_driver/__init__.py

@@ -3,7 +3,7 @@ from .client import Client
 from .dbapi import connect
 
 
-VERSION = (0, 2, 6)
+VERSION = (0, 2, 7)
 __version__ = '.'.join(str(x) for x in VERSION)
 
 __all__ = ['Client', 'connect']

clickhouse_driver/client.py

@@ -63,6 +63,11 @@ class Client(object):
                            tuple set ``namedtuple_as_json`` to ``False``.
                            Default: True.
                            New in version *0.2.6*.
+        * ``server_side_params`` -- Species on which side query parameters
+                           should be rendered into placeholders.
+                           Default: False. Means that parameters are rendered
+                           on driver's side.
+                           New in version *0.2.7*.
     """
 
     available_client_settings = (
@@ -74,7 +79,8 @@ class Client(object):
         'opentelemetry_tracestate',
         'quota_key',
         'input_format_null_as_default',
-        'namedtuple_as_json'
+        'namedtuple_as_json',
+        'server_side_params'
     )
 
     def __init__(self, *args, **kwargs):
@@ -107,6 +113,9 @@ class Client(object):
             ),
             'namedtuple_as_json': self.settings.pop(
                 'namedtuple_as_json', True
+            ),
+            'server_side_params': self.settings.pop(
+                'server_side_params', False
             )
         }
 
@@ -592,12 +601,12 @@ class Client(object):
         self.connection.send_query(query_without_data, query_id=query_id)
         self.connection.send_external_tables(external_tables,
                                              types_check=types_check)
-
         sample_block = self.receive_sample_block()
+
         if sample_block:
             rv = self.send_data(sample_block, data,
                                 types_check=types_check, columnar=columnar)
-            self.receive_end_of_query()
+            self.receive_end_of_insert_query()
             return rv
 
     def receive_sample_block(self):
@@ -651,8 +660,15 @@ class Client(object):
             self.connection.send_data(block)
             inserted_rows += block.num_rows
 
+            # Starting from the specific revision there are profile events
+            # sent by server in response to each inserted block
+            self.receive_profile_events()
+
         # Empty block means end of data.
         self.connection.send_data(block_cls())
+        # If enabled by revision profile events are also sent after empty block
+        self.receive_profile_events()
+
         return inserted_rows
 
     def receive_end_of_query(self):
@@ -663,7 +679,7 @@ class Client(object):
                 break
 
             elif packet.type == ServerPacketTypes.PROGRESS:
-                continue
+                self.last_query.store_progress(packet.progress)
 
             elif packet.type == ServerPacketTypes.EXCEPTION:
                 raise packet.exception
@@ -675,11 +691,64 @@ class Client(object):
                 pass
 
             elif packet.type == ServerPacketTypes.PROFILE_EVENTS:
-                pass
+                self.last_query.store_profile(packet.profile_info)
+
+            else:
+                message = self.connection.unexpected_packet_message(
+                    'Exception, EndOfStream, Progress, TableColumns, '
+                    'ProfileEvents or Log', packet.type
+                )
+                raise errors.UnexpectedPacketFromServerError(message)
+
+    def receive_end_of_insert_query(self):
+        while True:
+            packet = self.connection.receive_packet()
+
+            if packet.type == ServerPacketTypes.END_OF_STREAM:
+                break
+
+            elif packet.type == ServerPacketTypes.LOG:
+                log_block(packet.block)
+
+            elif packet.type == ServerPacketTypes.PROGRESS:
+                self.last_query.store_progress(packet.progress)
+
+            elif packet.type == ServerPacketTypes.EXCEPTION:
+                raise packet.exception
 
             else:
                 message = self.connection.unexpected_packet_message(
-                    'Exception, EndOfStream or Log', packet.type
+                    'EndOfStream, Log, Progress or Exception', packet.type
+                )
+                raise errors.UnexpectedPacketFromServerError(message)
+
+    def receive_profile_events(self):
+        revision = self.connection.server_info.used_revision
+        if (
+            revision <
+            defines.DBMS_MIN_PROTOCOL_VERSION_WITH_PROFILE_EVENTS_IN_INSERT
+        ):
+            return None
+
+        while True:
+            packet = self.connection.receive_packet()
+
+            if packet.type == ServerPacketTypes.PROFILE_EVENTS:
+                self.last_query.store_profile(packet.profile_info)
+                break
+
+            elif packet.type == ServerPacketTypes.PROGRESS:
+                self.last_query.store_progress(packet.progress)
+
+            elif packet.type == ServerPacketTypes.LOG:
+                log_block(packet.block)
+
+            elif packet.type == ServerPacketTypes.EXCEPTION:
+                raise packet.exception
+
+            else:
+                message = self.connection.unexpected_packet_message(
+                    'ProfileEvents, Progress, Log or Exception', packet.type
                 )
                 raise errors.UnexpectedPacketFromServerError(message)
 
@@ -706,6 +775,10 @@ class Client(object):
             # prints: SELECT 1234, 'bar'
             print(substituted_query)
         """
+        # In case of server side templating we don't substitute here.
+        if self.connection.context.client_settings['server_side_params']:
+            return query
+
         if not isinstance(params, dict):
             raise ValueError('Parameters are expected in dict form')
 

clickhouse_driver/columns/datecolumn.py

@@ -6,7 +6,7 @@ from .base import FormatColumn
 epoch_start = date(1970, 1, 1)
 epoch_end = date(2149, 6, 6)
 
-epoch_start_date32 = date(1925, 1, 1)
+epoch_start_date32 = date(1900, 1, 1)
 epoch_end_date32 = date(2283, 11, 11)
 
 
@@ -34,7 +34,7 @@ class DateColumn(FormatColumn):
                 items[i] = null_value
                 continue
 
-            if type(item) != date:
+            if item is not date:
                 item = date(item.year, item.month, item.day)
 
             if min_value <= item <= max_value:

clickhouse_driver/columns/uuidcolumn.py

@@ -54,7 +54,7 @@ class UUIDColumn(FormatColumn):
 
             try:
                 if not isinstance(item, UUID):
-                    item = UUID(item)
+                    item = UUID(int=item) if item is null_value else UUID(item)
 
             except ValueError:
                 raise errors.CannotParseUuidError(

clickhouse_driver/connection.py

@@ -20,7 +20,7 @@ from .log import log_block
 from .progress import Progress
 from .protocol import Compression, ClientPacketTypes, ServerPacketTypes
 from .queryprocessingstage import QueryProcessingStage
-from .reader import read_binary_str
+from .reader import read_binary_str, read_binary_uint64
 from .readhelpers import read_exception
 from .settings.writer import write_settings, SettingsFlags
 from .streams.native import BlockInputStream, BlockOutputStream
@@ -303,6 +303,7 @@ class Connection(object):
 
         version = ssl_options.get('ssl_version', ssl.PROTOCOL_TLS)
         context = ssl.SSLContext(version)
+        context.check_hostname = self.verify_cert
 
         if 'ca_certs' in ssl_options:
             context.load_verify_locations(ssl_options['ca_certs'])
@@ -496,6 +497,17 @@ class Connection(object):
                     defines.DBMS_MIN_REVISION_WITH_VERSION_PATCH:
                 server_version_patch = read_varint(self.fin)
 
+            if used_revision >= defines. \
+                    DBMS_MIN_PROTOCOL_VERSION_WITH_PASSWORD_COMPLEXITY_RULES:
+                rules_size = read_varint(self.fin)
+                for _i in range(rules_size):
+                    read_binary_str(self.fin)  # original_pattern
+                    read_binary_str(self.fin)  # exception_message
+
+            if used_revision >= defines. \
+                    DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2:
+                read_binary_uint64(self.fin)  # read_nonce
+
             self.server_info = ServerInfo(
                 server_name, server_version_major, server_version_minor,
                 server_version_patch, server_revision,
@@ -702,10 +714,13 @@ class Connection(object):
         write_binary_str(query, self.fout)
 
         if revision >= defines.DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS:
-            # Always settings_as_strings = True
-            escaped = escape_params(
-                params or {}, self.context, for_server=True
-            )
+            if self.context.client_settings['server_side_params']:
+                # Always settings_as_strings = True
+                escaped = escape_params(
+                    params or {}, self.context, for_server=True
+                )
+            else:
+                escaped = {}
             write_settings(escaped, self.fout, True, SettingsFlags.CUSTOM)
 
         logger.debug('Query: %s', query)

clickhouse_driver/defines.py

@@ -26,9 +26,13 @@ DBMS_MIN_PROTOCOL_VERSION_WITH_INITIAL_QUERY_START_TIME = 54449
 DBMS_MIN_PROTOCOL_VERSION_WITH_INCREMENTAL_PROFILE_EVENTS = 54451
 DBMS_MIN_REVISION_WITH_PARALLEL_REPLICAS = 54453
 DBMS_MIN_REVISION_WITH_CUSTOM_SERIALIZATION = 54454
+DBMS_MIN_PROTOCOL_VERSION_WITH_PROFILE_EVENTS_IN_INSERT = 54456
 DBMS_MIN_PROTOCOL_VERSION_WITH_ADDENDUM = 54458
 DBMS_MIN_PROTOCOL_VERSION_WITH_QUOTA_KEY = 54458
 DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS = 54459
+DBMS_MIN_PROTOCOL_VERSION_WITH_SERVER_QUERY_TIME_IN_PROGRESS = 54460
+DBMS_MIN_PROTOCOL_VERSION_WITH_PASSWORD_COMPLEXITY_RULES = 54461
+DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2 = 54462
 
 # Timeouts
 DBMS_DEFAULT_CONNECT_TIMEOUT_SEC = 10
@@ -44,7 +48,7 @@ CLIENT_NAME = 'python-driver'
 CLIENT_VERSION_MAJOR = 20
 CLIENT_VERSION_MINOR = 10
 CLIENT_VERSION_PATCH = 2
-CLIENT_REVISION = DBMS_MIN_PROTOCOL_VERSION_WITH_PARAMETERS
+CLIENT_REVISION = DBMS_MIN_REVISION_WITH_INTERSERVER_SECRET_V2
 
 BUFFER_SIZE = 1048576
 

clickhouse_driver/log.py

@@ -2,7 +2,8 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-
+# Keep in sync with ClickHouse priorities
+# https://github.com/ClickHouse/ClickHouse/blob/master/src/Interpreters/InternalTextLogsQueue.cpp
 log_priorities = (
     'Unknown',
     'Fatal',
@@ -12,9 +13,12 @@ log_priorities = (
     'Notice',
     'Information',
     'Debug',
-    'Trace'
+    'Trace',
+    'Test',
 )
 
+num_priorities = len(log_priorities)
+
 
 def log_block(block):
     if block is None:
@@ -25,7 +29,7 @@ def log_block(block):
     for row in block.get_rows():
         row = dict(zip(column_names, row))
 
-        if 1 <= row['priority'] <= 8:
+        if 1 <= row['priority'] <= num_priorities:
             priority = log_priorities[row['priority']]
         else:
             priority = row[0]

clickhouse_driver/progress.py

@@ -9,6 +9,7 @@ class Progress(object):
         self.total_rows = 0
         self.written_rows = 0
         self.written_bytes = 0
+        self.elapsed_ns = 0
 
         super(Progress, self).__init__()
 
@@ -24,9 +25,14 @@ class Progress(object):
             self.written_rows = read_varint(fin)
             self.written_bytes = read_varint(fin)
 
+        if revision >= defines. \
+                DBMS_MIN_PROTOCOL_VERSION_WITH_SERVER_QUERY_TIME_IN_PROGRESS:
+            self.elapsed_ns = read_varint(fin)
+
     def increment(self, another_progress):
         self.rows += another_progress.rows
         self.bytes += another_progress.bytes
         self.total_rows += another_progress.total_rows
         self.written_rows += another_progress.written_rows
         self.written_bytes += another_progress.written_bytes
+        self.elapsed_ns += another_progress.elapsed_ns

{clickhouse_driver-0.2.6.dist-info → clickhouse_driver-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clickhouse-driver
-Version: 0.2.6
+Version: 0.2.7
 Summary: Python driver with native interface for ClickHouse
 Home-page: https://github.com/mymarilyn/clickhouse-driver
 Author: Konstantin Lebedev

{clickhouse_driver-0.2.6.dist-info → clickhouse_driver-0.2.7.dist-info}/RECORD

@@ -1,22 +1,22 @@
-clickhouse_driver/varint.cpython-310-darwin.so,sha256=L0N-J74ycsPkUdk65ze1gQBVzoYOkWkzPwINnWHqoWE,81833
+clickhouse_driver/varint.cpython-310-darwin.so,sha256=RAIg4uHztyAA4sP3yYxLhK7UGwe2mTZVtElcPrnFBCQ,81849
 clickhouse_driver/blockstreamprofileinfo.py,sha256=nYx9QXWAS8aPiRbtAzwLRT5JIlJ8S103JMkudncwpFg,712
-clickhouse_driver/log.py,sha256=VLeOYXn5DW2hJ53m2w5bPsMrWG5cWnq5whE4e6euK_M,888
+clickhouse_driver/log.py,sha256=P9VS_YDY3a4JQsNOeUNNK0L1AAallTC1GF4FG5gCrac,1091
 clickhouse_driver/queryprocessingstage.py,sha256=lbV-bB5jWUp0hqYBTsUcRYkJhCgCTfN2G21AykMoAp0,186
 clickhouse_driver/protocol.py,sha256=ZRJuawN_v8wXFrHrcpSiBqu7idKsPd3tQnCcDuTlIw8,2561
-clickhouse_driver/client.py,sha256=c0IyAj5wxiHZgJLbFXvZm6ym5DIg1UXgPIsM2xuR3Mo,31798
-clickhouse_driver/bufferedreader.cpython-310-darwin.so,sha256=2C1gpAQUTaJtB7ssuNo_XHOUDICFyce467diYM6ylPk,150449
-clickhouse_driver/__init__.py,sha256=QRMXgeBnkcW_DpTqqIh29_xG072_EPoTyLy-1ik1MP0,158
+clickhouse_driver/client.py,sha256=Zk_gnfqOSz1_3uaTsBLtOHNGX0rsiklJUPpk-1aqnXQ,34707
+clickhouse_driver/bufferedreader.cpython-310-darwin.so,sha256=CpQImSiacw2en4bR6KxJpZXGto7jl3eyUlRHztF_NAI,150529
+clickhouse_driver/__init__.py,sha256=Zc8GO1dmRR77BGXAzQx9tuX5pBumMtqQzQ4SH3xmBfU,158
 clickhouse_driver/opentelemetry.py,sha256=GIzHCxdB8LB1ozXtUjIpxsdznmRABAts64G2u2l4C_A,1622
 clickhouse_driver/clientinfo.py,sha256=Tw3NbuDHglT6_f0AcT0IdhqW_hVePtzh9pypx5nk5ZE,4260
 clickhouse_driver/reader.py,sha256=PWKOKwjszu0sJbG-dd_TyGn8tQAzxg2gCJVbz27G3-8,1322
 clickhouse_driver/result.py,sha256=RpjBUvRQJ70xISye7u6gxgQBJwc2UkNuusLkaZF7SmM,4098
-clickhouse_driver/bufferedwriter.cpython-310-darwin.so,sha256=knno11b8yZTvKyZCtzL5oRDvB-hSD3GpTh-kSlRMZhU,149393
-clickhouse_driver/connection.py,sha256=DTw_NofAVNS5spk5E0G-BkX-0H4gp3LZEJ59nmW8WZc,27679
+clickhouse_driver/bufferedwriter.cpython-310-darwin.so,sha256=4KleUS_wr5VxEtSRXuYk0yfUOzrh9hW9ZHeOZ7ieSKQ,149761
+clickhouse_driver/connection.py,sha256=Lzx6bjPDEZleEtFaede4_BcRmALIbJyQLymSmj7zAHY,28399
 clickhouse_driver/context.py,sha256=yPkJ_BN4LGODvKCOjNlDGqABwxAMQTQl7w1vIGRPBDg,909
-clickhouse_driver/defines.py,sha256=jM3nFdT4EPUIIj1add1BOu7T9DJv_-UOzfdbX6k3uEk,1704
+clickhouse_driver/defines.py,sha256=hXIR10BvH_sxUN35pk-f-VeIbM7CA0Ll2B2yNuAy10A,1958
 clickhouse_driver/writer.py,sha256=yf5f1vTr56YFtL-Swpi_jBsPw5bQS56j53joB0Acdyk,1286
 clickhouse_driver/errors.py,sha256=mffBg-Y2LFOSRzvE9V34RwFcvmfh67yqLeEBhrdjeXE,14343
-clickhouse_driver/progress.py,sha256=aQUPzOg0S1kRthV1aYo-KsTmlcdM0uXVZDLDtoyKSUY,1045
+clickhouse_driver/progress.py,sha256=MagDPiLzWG-2Arecu5O6JlK98242ayt9yPa9H7v9o5k,1288
 clickhouse_driver/block.py,sha256=t2zZhtCzwp4aJj0CuDqXlDEgHXgwc6GRsIks2aaIZvI,6311
 clickhouse_driver/readhelpers.py,sha256=tXOmSL9GSeHLdKE2yBlk0epfy-hGJ3bTOLq3Q6sXIkw,717
 clickhouse_driver/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -46,10 +46,10 @@ clickhouse_driver/dbapi/errors.py,sha256=yv2SDIK-ZlWmIxBoF5_igfHRyh9zTUJSgAj9g8S
 clickhouse_driver/dbapi/cursor.py,sha256=MOtVhXVkDYxXTAM_AeesKxrcsR64Rt2tRYVmsWLM_tQ,10517
 clickhouse_driver/columns/service.py,sha256=6nIGwvcG-5LErQFn_3a2GRKZI2OnKYsy2oIIMhxJqlc,6181
 clickhouse_driver/columns/floatcolumn.py,sha256=Mci7Fl05dgkpDQRfjGaDP9QraZER5nkYX1lVsTA89Yk,925
-clickhouse_driver/columns/largeint.cpython-310-darwin.so,sha256=RgjhqC3O5gj2RjSETC71HCdDLxDrf6FODTmH_Hq0QQs,100443
-clickhouse_driver/columns/uuidcolumn.py,sha256=d-dR_CIgtQd-CzCO90HJoeR86j7ejVchOnAKu73rVoQ,1823
+clickhouse_driver/columns/largeint.cpython-310-darwin.so,sha256=ASXHYAGtXc_oUJ6KkLpMFk3PTCWdtcvN3fFdT4HtCaU,100491
+clickhouse_driver/columns/uuidcolumn.py,sha256=7CLPxsHJtV6Zt9jxILSkE0LAwffloLmrjjbwCZH34mA,1865
 clickhouse_driver/columns/arraycolumn.py,sha256=UiA48jw3o4-ert8BnzEbl2h1jVmtDH3jtcP1BTPru2w,5322
-clickhouse_driver/columns/datecolumn.py,sha256=Xg6qHb7Lj5twtMa0jL74qoffgYMt2gK_AY9mycRxBqQ,1931
+clickhouse_driver/columns/datecolumn.py,sha256=FzgS5ayxW6zfyM5qD1NXXiR4PTKz0tXEC48TwtQvbyI,1929
 clickhouse_driver/columns/nestedcolumn.py,sha256=7x3xNYR22kEmgV4_3rPVZea2zCTU364O1tlOewMgw3M,303
 clickhouse_driver/columns/util.py,sha256=5DRGBsWSTldqZRZJ53J85zh_jepkwkAsYXhAeDJQW4I,1395
 clickhouse_driver/columns/enumcolumn.py,sha256=GCSW-fjtJC4_5YKo9oKtG8GT9UhLcRWCjrBVhEAUp-A,3219
@@ -82,8 +82,8 @@ clickhouse_driver/columns/numpy/boolcolumn.py,sha256=0_RwEroY2-ZqMuxKeTNG27ZCWN_
 clickhouse_driver/columns/numpy/stringcolumn.py,sha256=FH87XPQv3ga0ZJnngubqu4DgxmUt8bjW8xJcNfOU7EI,2439
 clickhouse_driver/columns/numpy/datetimecolumn.py,sha256=XQ3JsxVdAvWJndNek4-i07JO2QJIdUnJQWzOxvF3PMc,4777
 clickhouse_driver/columns/numpy/base.py,sha256=Wk1ADpoQGWQv5X8sWi0esA2jmQGEoDakXZxImuYM2eM,1410
-clickhouse_driver-0.2.6.dist-info/RECORD,,
-clickhouse_driver-0.2.6.dist-info/LICENSE,sha256=b2SjNa4zGQk6XzJwmeE1dQjjtWRvX_zxJIAl_ZbN_S8,1143
-clickhouse_driver-0.2.6.dist-info/WHEEL,sha256=ReeDLt7JoWNv8uQs9jcofmiBOX-MvocIgD8kJPMfr7M,110
-clickhouse_driver-0.2.6.dist-info/top_level.txt,sha256=PrE0Lrs4d-gRQwzABaABfym9Qvr4nN6uTrDy6Q7zQME,18
-clickhouse_driver-0.2.6.dist-info/METADATA,sha256=ZkVosSXAz8QJEahMUNdyzEkuP56KeNVnleLRyPwBA_Y,6089
+clickhouse_driver-0.2.7.dist-info/RECORD,,
+clickhouse_driver-0.2.7.dist-info/LICENSE,sha256=b2SjNa4zGQk6XzJwmeE1dQjjtWRvX_zxJIAl_ZbN_S8,1143
+clickhouse_driver-0.2.7.dist-info/WHEEL,sha256=ReeDLt7JoWNv8uQs9jcofmiBOX-MvocIgD8kJPMfr7M,110
+clickhouse_driver-0.2.7.dist-info/top_level.txt,sha256=PrE0Lrs4d-gRQwzABaABfym9Qvr4nN6uTrDy6Q7zQME,18
+clickhouse_driver-0.2.7.dist-info/METADATA,sha256=aQbor1BmjoDfoRvIPRh1m4XHe2Go7rRm2L-zCGde_lM,6089