Fix handling of JSON data

Introduced in 5.7.8

Fixes julien-duponchelle#181

Signed-off-by: Arthur Gautier <[email protected]>

Author: Arthur Gautier

pymysqlreplication/constants/FIELD_TYPE.py

@@ -41,6 +41,7 @@
 TIMESTAMP2 = 17
 DATETIME2 = 18
 TIME2 = 19
+JSON = 245 # Introduced in 5.7.8
 NEWDECIMAL = 246
 ENUM = 247
 SET = 248

pymysqlreplication/row_event.py

@@ -3,6 +3,7 @@
 import struct
 import decimal
 import datetime
+import json
 
 from pymysql.util import byte2int
 from pymysql.charset import charset_to_encoding
@@ -167,6 +168,10 @@ def _read_column_data(self,  cols_bitmap):
             elif column.type == FIELD_TYPE.GEOMETRY:
                 values[name] = self.packet.read_length_coded_pascal_string(
                     column.length_size)
+            elif column.type == FIELD_TYPE.JSON:
+                data = self.packet.read_length_coded_pascal_string(
+                    column.length_size))
+                values[name] = json.loads(data)
             else:
                 raise NotImplementedError("Unknown MySQL column type: %d" %
                                           (column.type))

pymysqlreplication/tests/test_data_type.py

@@ -413,6 +413,24 @@ def test_geometry(self):
         event = self.create_and_insert_value(create_query, insert_query)
         self.assertEqual(event.rows[0]["values"]["test"], b'\x00\x00\x00\x00\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\xf0?')
 
+    def test_json(self):
+        if self.isMySQL57():
+            # https://dev.mysql.com/doc/refman/5.7/en/migrating-to-year4.html
+            self.skipTest("YEAR(2) is unsupported in mysql 5.7")
+        create_query = "CREATE TABLE test (id int, value json);"
+        insert_query = """INSERT INTO test (id, value) VALUES (1, '{"my_key": "my_val"}');"""
+        event = self.create_and_insert_value(create_query, insert_query)
+        self.assertEqual(event.rows[0]["values"]["value"], '{"my_key": "my_val"}')
+
+    def test_json_unicode(self):
+        if self.isMySQL57():
+            # https://dev.mysql.com/doc/refman/5.7/en/migrating-to-year4.html
+            self.skipTest("YEAR(2) is unsupported in mysql 5.7")
+        create_query = "CREATE TABLE test (id int, value json);"
+        insert_query = u"""INSERT INTO test (id, value) VALUES (1, '{"miam": "🍔"}');"""
+        event = self.create_and_insert_value(create_query, insert_query)
+        self.assertEqual(event.rows[0]["values"]["value"]["miam"], u'🍔')
+
     def test_null(self):
         create_query = "CREATE TABLE test ( \
             test TINYINT NULL DEFAULT NULL, \