AP-1531 Zero-pad fixed-length binary fields (#162)

transferwise · Aug 9, 2023 · 1b4861a · 1b4861a
1 parent a9d18f3
commit 1b4861a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/setup.py b/setup.py
@@ -20,8 +20,8 @@
       install_requires=[
           'pendulum==2.1.2',
           'pipelinewise-singer-python==1.*',
+          'mysql-replication==0.43',
           'PyMySQL==1.1.*',
-          'mysql-replication==0.40',
           'plpygis==0.2.1',
           'tzlocal==2.1',
       ],

diff --git a/tap_mysql/sync_strategies/common.py b/tap_mysql/sync_strategies/common.py
@@ -75,7 +75,7 @@ def generate_select_sql(catalog_entry, columns):
         # null bytes 0x00 and hexifying the column.
         if property_format == 'binary':
             escaped_columns.append(
-                f'hex(trim(trailing CHAR(0x00) from {escaped_col})) as {escaped_col}')
+                f'hex({escaped_col}) as {escaped_col}')
         elif property_format == 'spatial':
             escaped_columns.append(
                 f'ST_AsGeoJSON({escaped_col}) as {escaped_col}')

diff --git a/tests/integration/test_tap_mysql.py b/tests/integration/test_tap_mysql.py
@@ -1322,10 +1322,10 @@ def test_sync_messages_are_correct(self):
 
         self.assertEqual(len(record_messages), 4)
         self.assertListEqual([
-            {'age': 20, 'good_pk': '61'},
-            {'age': 30, 'good_pk': '62'},
-            {'age': 30, 'good_pk': '63'},
-            {'age': 40, 'good_pk': '64'},
+            {'age': 20, 'good_pk': '61000000000000000000'},
+            {'age': 30, 'good_pk': '62000000000000000000'},
+            {'age': 30, 'good_pk': '63000000000000000000'},
+            {'age': 40, 'good_pk': '64000000000000000000'},
         ], [rec.record for rec in record_messages])
 
         # get the last state message to be fed to the next sync
@@ -1349,12 +1349,12 @@ def test_sync_messages_are_correct(self):
 
         self.assertEqual(len(record_messages), 6)
         self.assertListEqual([
-            {'age': 25, 'good_pk': '61'},
-            {'age': 35, 'good_pk': '62'},
-            {'age': 35, 'good_pk': '63'},
-            {'age': 45, 'good_pk': '64'},
-            {'age': 16, 'good_pk': '65'},
-            {'age': 5, 'good_pk': '66'},
+            {'age': 25, 'good_pk': '61000000000000000000'},
+            {'age': 35, 'good_pk': '62000000000000000000'},
+            {'age': 35, 'good_pk': '63000000000000000000'},
+            {'age': 45, 'good_pk': '64000000000000000000'},
+            {'age': 16, 'good_pk': '65000000000000000000'},
+            {'age': 5, 'good_pk': '66000000000000000000'},
         ], [rec.record for rec in record_messages])
 
     def tearDown(self) -> None: