Merge pull request PyMySQL#477 from bmamouri/master

methane · web-flow · commit f2e79cd1817a · 2016-06-24T23:36:27.000+09:00
Add JSON field type and include it in TEXT_TYPES list to prevent encoding problems
diff --git a/pymysql/connections.py b/pymysql/connections.py
@@ -88,6 +88,7 @@ def _makefile(sock, mode):
     FIELD_TYPE.BLOB,
     FIELD_TYPE.LONG_BLOB,
     FIELD_TYPE.MEDIUM_BLOB,
+    FIELD_TYPE.JSON,
     FIELD_TYPE.STRING,
     FIELD_TYPE.TINY_BLOB,
     FIELD_TYPE.VAR_STRING,
diff --git a/pymysql/constants/FIELD_TYPE.py b/pymysql/constants/FIELD_TYPE.py
@@ -17,6 +17,7 @@
 NEWDATE = 14
 VARCHAR = 15
 BIT = 16
+JSON = 245
 NEWDECIMAL = 246
 ENUM = 247
 SET = 248
