revise the type system

clickhouse_driver/block.py

@@ -171,7 +171,7 @@ def _pure_mutate_dicts_to_rows(
         columns_with_cwt = []
         for name, type_ in columns_with_types:
             cwt = None
-            if type_.startswith('Nested'):
+            if type_.startswith('nested'):
                 cwt = nestedcolumn.get_columns_with_types(type_)
             columns_with_cwt.append((name, cwt))
 

clickhouse_driver/columns/datecolumn.py

@@ -11,7 +11,7 @@
 
 
 class DateColumn(FormatColumn):
-    ch_type = 'Date'
+    ch_type = 'date'
     py_types = (date, )
     format = 'H'
 
@@ -55,7 +55,7 @@ def after_read_items(self, items, nulls_map=None):
 
 
 class Date32Column(DateColumn):
-    ch_type = 'Date32'
+    ch_type = 'date32'
     format = 'i'
 
     min_value = epoch_start_date32

clickhouse_driver/columns/datetimecolumn.py

@@ -8,7 +8,7 @@
 
 
 class DateTimeColumn(FormatColumn):
-    ch_type = 'DateTime'
+    ch_type = 'datetime'
     py_types = (datetime, int)
     format = 'I'
 
@@ -85,7 +85,7 @@ def before_write_items(self, items, nulls_map=None):
 
 
 class DateTime64Column(DateTimeColumn):
-    ch_type = 'DateTime64'
+    ch_type = 'datetime64'
     format = 'q'
 
     max_scale = 6
@@ -170,7 +170,7 @@ def before_write_items(self, items, nulls_map=None):
 
 
 def create_datetime_column(spec, column_options):
-    if spec.startswith('DateTime64'):
+    if spec.startswith('datetime64'):
         cls = DateTime64Column
         spec = spec[11:-1]
         params = spec.split(',', 1)
@@ -193,6 +193,7 @@ def create_datetime_column(spec, column_options):
     else:
         if not context.settings.get('use_client_time_zone', False):
             local_timezone = get_localzone_name_compat()
+
             if local_timezone != context.server_info.timezone:
                 tz_name = context.server_info.timezone
 

clickhouse_driver/columns/decimalcolumn.py

@@ -8,18 +8,18 @@
 class DecimalColumn(FormatColumn):
     py_types = (Decimal, float, int)
     max_precision = None
+    int_size = None
 
     def __init__(self, precision, scale, types_check=False, **kwargs):
         self.precision = precision
         self.scale = scale
         super(DecimalColumn, self).__init__(**kwargs)
 
         if types_check:
-            def check_item(value):
-                parts = str(value).split('.')
-                int_part = parts[0]
+            max_signed_int = (1 << (8 * self.int_size - 1)) - 1
 
-                if len(int_part) > precision:
+            def check_item(value):
+                if value < -max_signed_int or value > max_signed_int:
                     raise ColumnTypeMismatchException(value)
 
             self.check_item = check_item
@@ -80,11 +80,13 @@ def _read_data(self, n_items, buf, nulls_map=None):
 class Decimal32Column(DecimalColumn):
     format = 'i'
     max_precision = 9
+    int_size = 4
 
 
 class Decimal64Column(DecimalColumn):
     format = 'q'
     max_precision = 18
+    int_size = 8
 
 
 class Decimal128Column(DecimalColumn, Int128Column):

clickhouse_driver/columns/enumcolumn.py

@@ -54,19 +54,19 @@ def after_read_items(self, items, nulls_map=None):
 
 
 class Enum8Column(EnumColumn):
-    ch_type = 'Enum8'
+    ch_type = 'enum8'
     format = 'b'
     int_size = 1
 
 
 class Enum16Column(EnumColumn):
-    ch_type = 'Enum16'
+    ch_type = 'enum16'
     format = 'h'
     int_size = 2
 
 
 def create_enum_column(spec, column_options):
-    if spec.startswith('Enum8'):
+    if spec.startswith('enum8'):
         params = spec[6:-1]
         cls = Enum8Column
     else:

clickhouse_driver/columns/floatcolumn.py

@@ -8,7 +8,7 @@ class FloatColumn(FormatColumn):
 
 
 class Float32Column(FloatColumn):
-    ch_type = 'Float32'
+    ch_type = 'float32'
     format = 'f'
 
     def __init__(self, types_check=False, **kwargs):
@@ -30,5 +30,5 @@ def before_write_items(items, nulls_map=None):
 
 
 class Float64Column(FloatColumn):
-    ch_type = 'Float64'
+    ch_type = 'float64'
     format = 'd'

clickhouse_driver/columns/intcolumn.py

@@ -52,49 +52,49 @@ def check_item(value):
 
 
 class Int8Column(IntColumn):
-    ch_type = 'Int8'
+    ch_type = 'int8'
     format = 'b'
     int_size = 1
 
 
 class Int16Column(IntColumn):
-    ch_type = 'Int16'
+    ch_type = 'int16'
     format = 'h'
     int_size = 2
 
 
 class Int32Column(IntColumn):
-    ch_type = 'Int32'
+    ch_type = 'int32'
     format = 'i'
     int_size = 4
 
 
 class Int64Column(IntColumn):
-    ch_type = 'Int64'
+    ch_type = 'int64'
     format = 'q'
     int_size = 8
 
 
 class UInt8Column(UIntColumn):
-    ch_type = 'UInt8'
+    ch_type = 'uint8'
     format = 'B'
     int_size = 1
 
 
 class UInt16Column(UIntColumn):
-    ch_type = 'UInt16'
+    ch_type = 'uint16'
     format = 'H'
     int_size = 2
 
 
 class UInt32Column(UIntColumn):
-    ch_type = 'UInt32'
+    ch_type = 'uint32'
     format = 'I'
     int_size = 4
 
 
 class UInt64Column(UIntColumn):
-    ch_type = 'UInt64'
+    ch_type = 'uint64'
     format = 'Q'
     int_size = 8
 
@@ -122,7 +122,7 @@ def read_items(self, n_items, buf):
 
 
 class Int128Column(LargeIntColumn):
-    ch_type = 'Int128'
+    ch_type = 'int128'
     int_size = 16
     factor = 2
 
@@ -131,7 +131,7 @@ class Int128Column(LargeIntColumn):
 
 
 class UInt128Column(LargeIntColumn):
-    ch_type = 'UInt128'
+    ch_type = 'uint128'
     int_size = 16
     factor = 2
 
@@ -140,7 +140,7 @@ class UInt128Column(LargeIntColumn):
 
 
 class Int256Column(LargeIntColumn):
-    ch_type = 'Int256'
+    ch_type = 'int256'
     int_size = 32
     factor = 4
 
@@ -149,7 +149,7 @@ class Int256Column(LargeIntColumn):
 
 
 class UInt256Column(LargeIntColumn):
-    ch_type = 'UInt256'
+    ch_type = 'uint256'
     int_size = 32
     factor = 4
 

clickhouse_driver/columns/intervalcolumn.py

@@ -6,28 +6,28 @@ class IntervalColumn(Int64Column):
 
 
 class IntervalDayColumn(IntervalColumn):
-    ch_type = 'IntervalDay'
+    ch_type = 'interval_day'
 
 
 class IntervalWeekColumn(IntervalColumn):
-    ch_type = 'IntervalWeek'
+    ch_type = 'interval_week'
 
 
 class IntervalMonthColumn(IntervalColumn):
-    ch_type = 'IntervalMonth'
+    ch_type = 'interval_month'
 
 
 class IntervalYearColumn(IntervalColumn):
-    ch_type = 'IntervalYear'
+    ch_type = 'interval_year'
 
 
 class IntervalHourColumn(IntervalColumn):
-    ch_type = 'IntervalHour'
+    ch_type = 'interval_hour'
 
 
 class IntervalMinuteColumn(IntervalColumn):
-    ch_type = 'IntervalMinute'
+    ch_type = 'interval_minute'
 
 
 class IntervalSecondColumn(IntervalColumn):
-    ch_type = 'IntervalSecond'
+    ch_type = 'interval_second'

clickhouse_driver/columns/ipcolumn.py

@@ -7,7 +7,7 @@
 
 
 class IPv4Column(UInt32Column):
-    ch_type = "IPv4"
+    ch_type = "ipv4"
     py_types = (str, IPv4Address, int)
 
     def __init__(self, types_check=False, **kwargs):
@@ -65,7 +65,7 @@ def before_write_items(self, items, nulls_map=None):
 
 
 class IPv6Column(ByteFixedString):
-    ch_type = "IPv6"
+    ch_type = "ipv6"
     py_types = (str, IPv6Address, bytes)
 
     def __init__(self, types_check=False, **kwargs):

clickhouse_driver/columns/nothingcolumn.py

@@ -2,7 +2,7 @@
 
 
 class NothingColumn(FormatColumn):
-    ch_type = 'Nothing'
+    ch_type = 'nothing'
     format = 'B'
 
     @property

clickhouse_driver/columns/nullcolumn.py

@@ -4,7 +4,7 @@
 # TODO: Drop Null column support in future.
 # Compatibility with old servers.
 class NullColumn(FormatColumn):
-    ch_type = 'Null'
+    ch_type = 'NULL'
     format = 'B'
 
     @property

clickhouse_driver/columns/numpy/datecolumn.py

@@ -5,7 +5,7 @@
 
 class NumpyDateColumn(NumpyColumn):
     dtype = np.dtype(np.uint16)
-    ch_type = 'Date'
+    ch_type = 'date'
 
     null_value = np.datetime64(0, 'Y')
 

clickhouse_driver/columns/numpy/datetimecolumn.py

@@ -107,7 +107,7 @@ def write_items(self, items, buf):
 
 
 def create_numpy_datetime_column(spec, column_options):
-    if spec.startswith('DateTime64'):
+    if spec.startswith('datetime64'):
         cls = NumpyDateTime64Column
         spec = spec[11:-1]
         params = spec.split(',', 1)

clickhouse_driver/columns/numpy/floatcolumn.py

@@ -8,7 +8,7 @@
 
 class NumpyFloat32Column(NumpyColumn):
     dtype = np.dtype(np.float32)
-    ch_type = 'Float32'
+    ch_type = 'float32'
     normalize_null_value = False
 
     def _get_nulls_map(self, items):
@@ -17,7 +17,7 @@ def _get_nulls_map(self, items):
 
 class NumpyFloat64Column(NumpyColumn):
     dtype = np.dtype(np.float64)
-    ch_type = 'Float64'
+    ch_type = 'float64'
     normalize_null_value = False
 
     def _get_nulls_map(self, items):

clickhouse_driver/columns/numpy/intcolumn.py

@@ -5,39 +5,39 @@
 
 class NumpyInt8Column(NumpyColumn):
     dtype = np.dtype(np.int8)
-    ch_type = 'Int8'
+    ch_type = 'int8'
 
 
 class NumpyUInt8Column(NumpyColumn):
     dtype = np.dtype(np.uint8)
-    ch_type = 'UInt8'
+    ch_type = 'uint8'
 
 
 class NumpyInt16Column(NumpyColumn):
     dtype = np.dtype(np.int16)
-    ch_type = 'Int16'
+    ch_type = 'int16'
 
 
 class NumpyUInt16Column(NumpyColumn):
     dtype = np.dtype(np.uint16)
-    ch_type = 'UInt16'
+    ch_type = 'uint16'
 
 
 class NumpyInt32Column(NumpyColumn):
     dtype = np.dtype(np.int32)
-    ch_type = 'Int32'
+    ch_type = 'int32'
 
 
 class NumpyUInt32Column(NumpyColumn):
     dtype = np.dtype(np.uint32)
-    ch_type = 'UInt32'
+    ch_type = 'uint32'
 
 
 class NumpyInt64Column(NumpyColumn):
     dtype = np.dtype(np.int64)
-    ch_type = 'Int64'
+    ch_type = 'int64'
 
 
 class NumpyUInt64Column(NumpyColumn):
     dtype = np.dtype(np.uint64)
-    ch_type = 'UInt64'
+    ch_type = 'uint64'