UInt32 handling

Author: bakwc

mysql_ch_replicator/converter.py

@@ -67,9 +67,9 @@ def convert_type(self, mysql_type, parameters):
 
         is_unsigned = 'unsigned' in parameters.lower()
 
-        print(" === check mysql_type", mysql_type, parameters)
-
         if mysql_type == 'int':
+            if is_unsigned:
+                return 'UInt32'
             return 'Int32'
         if mysql_type == 'integer':
             return 'Int32'
@@ -119,7 +119,9 @@ def convert_type(self, mysql_type, parameters):
             return 'Float32'
         if 'double' in mysql_type:
             return 'Float64'
-        if 'integer' in mysql_type:
+        if 'integer' in mysql_type or 'int(' in mysql_type:
+            if is_unsigned:
+                return 'UInt32'
             return 'Int32'
         if 'real' in mysql_type:
             return 'Float64'
@@ -134,7 +136,6 @@ def convert_field_type(self, mysql_type, mysql_parameters):
         mysql_parameters = mysql_parameters.lower()
         not_null = 'not null' in mysql_parameters
         clickhouse_type = self.convert_type(mysql_type, mysql_parameters)
-        print(" === result type:", clickhouse_type)
         if not not_null:
             clickhouse_type = f'Nullable({clickhouse_type})'
         return clickhouse_type
@@ -179,6 +180,8 @@ def convert_record(self, mysql_record, mysql_field_types, clickhouse_field_types
                 clickhouse_field_value = 256 + clickhouse_field_value
             if 'mediumint' in mysql_field_type.lower() and clickhouse_field_value < 0:
                 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
             clickhouse_record.append(clickhouse_field_value)
         return tuple(clickhouse_record)
 

test_mysql_ch_replicator.py

@@ -610,13 +610,14 @@ def test_numeric_types_and_limits():
     test3 TINYINT,
     test4 TINYINT UNSIGNED,
     test5 MEDIUMINT UNSIGNED,
+    test6 INT UNSIGNED,
     PRIMARY KEY (id)
 ); 
     ''')
 
     mysql.execute(
-        f"INSERT INTO {TEST_TABLE_NAME} (name, test1, test2, test3, test4, test5) VALUES "
-        f"('Ivan', -20000, 50000, -30, 100, 16777200);",
+        f"INSERT INTO {TEST_TABLE_NAME} (name, test1, test2, test3, test4, test5, test6) VALUES "
+        f"('Ivan', -20000, 50000, -30, 100, 16777200, 4294967290);",
         commit=True,
     )
 
@@ -633,11 +634,13 @@ 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) VALUES "
-        f"('Peter', -10000, 60000, -120, 250, 16777200);",
+        f"INSERT INTO {TEST_TABLE_NAME} (name, test1, test2, test3, test4, test5, test6) VALUES "
+        f"('Peter', -10000, 60000, -120, 250, 16777200, 4294967280);",
         commit=True,
     )
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME)) == 2)
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME, 'test2=60000')) == 1)
     assert_wait(lambda: len(ch.select(TEST_TABLE_NAME, 'test4=250')) == 1)
     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)