clickhouse-driver 0.1.3__cp38-cp38-macosx_10_9_x86_64.whl → 0.2.9__cp38-cp38-macosx_10_9_x86_64.whl

clickhouse_driver/__init__.py

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

clickhouse_driver/block.py

@@ -1,3 +1,4 @@
+from .columns.util import get_inner_spec, get_inner_columns_with_types
 from .reader import read_varint, read_binary_uint8, read_binary_int32
 from .varint import write_varint
 from .writer import write_binary_uint8, write_binary_int32
@@ -61,7 +62,7 @@ class BaseBlock(object):
         raise NotImplementedError
 
     def transposed(self):
-        return list(map(tuple, zip(*self.data)))
+        return list(zip(*self.data))
 
 
 class ColumnOrientedBlock(BaseBlock):
@@ -132,6 +133,9 @@ class RowOrientedBlock(BaseBlock):
 
     @property
     def num_columns(self):
+        if self.columns_with_types is not None:
+            return len(self.columns_with_types)
+
         return len(self.data[0]) if self.num_rows else 0
 
     @property
@@ -148,17 +152,45 @@ class RowOrientedBlock(BaseBlock):
         return [row[index] for row in self.data]
 
     def _mutate_dicts_to_rows(self, data):
-        column_names = [x[0] for x in self.columns_with_types]
-
         check_row_type = False
         if self.types_check:
             check_row_type = self._check_dict_row_type
 
+        return self._pure_mutate_dicts_to_rows(
+            data,
+            self.columns_with_types,
+            check_row_type,
+        )
+
+    def _pure_mutate_dicts_to_rows(
+        self,
+        data,
+        columns_with_types,
+        check_row_type,
+    ):
+        columns_with_cwt = []
+        for name, type_ in columns_with_types:
+            cwt = None
+            if type_.startswith('Nested'):
+                inner_spec = get_inner_spec('Nested', type_)
+                cwt = get_inner_columns_with_types(inner_spec)
+            columns_with_cwt.append((name, cwt))
+
         for i, row in enumerate(data):
             if check_row_type:
                 check_row_type(row)
 
-            data[i] = [row[name] for name in column_names]
+            new_data = []
+            for name, cwt in columns_with_cwt:
+                if cwt is None:
+                    new_data.append(row[name])
+                else:
+                    new_data.append(self._pure_mutate_dicts_to_rows(
+                        row[name], cwt, check_row_type
+                    ))
+            data[i] = new_data
+        # return for recursion
+        return data
 
     def _check_rows(self, data):
         expected_row_len = len(self.columns_with_types)