Bigint support

Author: bakwc

mysql_ch_replicator/converter.py

@@ -72,8 +72,12 @@ def convert_type(self, mysql_type, parameters):
                 return 'UInt32'
             return 'Int32'
         if mysql_type == 'integer':
+            if is_unsigned:
+                return 'UInt32'
             return 'Int32'
         if mysql_type == 'bigint':
+            if is_unsigned:
+                return 'UInt64'
             return 'Int64'
         if mysql_type == 'double':
             return 'Float64'
@@ -123,6 +127,10 @@ def convert_type(self, mysql_type, parameters):
             if is_unsigned:
                 return 'UInt32'
             return 'Int32'
+        if 'bigint' in mysql_type:
+            if is_unsigned:
+                return 'UInt64'
+            return 'Int64'
         if 'real' in mysql_type:
             return 'Float64'
         if mysql_type.startswith('time'):
@@ -182,6 +190,8 @@ def convert_record(self, mysql_record, mysql_field_types, clickhouse_field_types
                 clickhouse_field_value = 16777216 + clickhouse_field_value
             if 'UInt32' in clickhouse_field_type and clickhouse_field_value < 0:
                 clickhouse_field_value = 4294967296 + clickhouse_field_value
+            if 'UInt64' in clickhouse_field_type and clickhouse_field_value < 0:
+                clickhouse_field_value = 18446744073709551616 + clickhouse_field_value
             clickhouse_record.append(clickhouse_field_value)
         return tuple(clickhouse_record)
 

test_mysql_ch_replicator.py

@@ -611,13 +611,14 @@ def test_numeric_types_and_limits():
     test4 TINYINT UNSIGNED,
     test5 MEDIUMINT UNSIGNED,
     test6 INT UNSIGNED,
+    test7 BIGINT UNSIGNED,
     PRIMARY KEY (id)
 ); 
     ''')
 
     mysql.execute(
-        f"INSERT INTO {TEST_TABLE_NAME} (name, test1, test2, test3, test4, test5, test6) VALUES "
-        f"('Ivan', -20000, 50000, -30, 100, 16777200, 4294967290);",
+        f"INSERT INTO {TEST_TABLE_NAME} (name, test1, test2, test3, test4, test5, test6, test7) VALUES "
+        f"('Ivan', -20000, 50000, -30, 100, 16777200, 4294967290, 18446744073709551586);",
         commit=True,
     )
 
@@ -634,8 +635,8 @@ def test_numeric_types_and_limits():
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME)) == 1)
 
     mysql.execute(
-        f"INSERT INTO {TEST_TABLE_NAME} (name, test1, test2, test3, test4, test5, test6) VALUES "
-        f"('Peter', -10000, 60000, -120, 250, 16777200, 4294967280);",
+        f"INSERT INTO {TEST_TABLE_NAME} (name, test1, test2, test3, test4, test5, test6, test7) VALUES "
+        f"('Peter', -10000, 60000, -120, 250, 16777200, 4294967280, 18446744073709551586);",
         commit=True,
     )
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME)) == 2)
@@ -644,3 +645,4 @@ def test_numeric_types_and_limits():
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME, 'test5=16777200')) == 2)
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME, 'test6=4294967290')) == 1)
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME, 'test6=4294967280')) == 1)
+    assert_wait(lambda: len(ch.select(TEST_TABLE_NAME, 'test7=18446744073709551586')) == 2)