Add more test

methane · methane · commit 6932b0a7fd09 · 2016-07-29T00:24:07.000+09:00
diff --git a/pymysql/converters.py b/pymysql/converters.py
@@ -333,12 +333,6 @@ def convert_set(s):
     return set(s.split(","))
 
 
-def convert_json(b):
-    # JSON is returned as binary data.
-    # Decode with utf-8 regardless connection encoding.
-    return b.decode('utf-8')
-
-
 def through(x):
     return x
 
@@ -416,7 +410,6 @@ def convert_characters(connection, field, data):
     FIELD_TYPE.VARCHAR: through,
     FIELD_TYPE.DECIMAL: Decimal,
     FIELD_TYPE.NEWDECIMAL: Decimal,
-    FIELD_TYPE.JSON: convert_json,
 }
 
 
diff --git a/pymysql/tests/test_basic.py b/pymysql/tests/test_basic.py
@@ -253,12 +253,17 @@ def test_json(self):
     primary key (id)
 );""")
         cur = conn.cursor()
+
         json_str = u'{"hello": "こんにちは"}'
         cur.execute("INSERT INTO test_json (id, `json`) values (42, %s)", (json_str,))
         cur.execute("SELECT `json` from `test_json` WHERE `id`=42")
         res = cur.fetchone()[0]
         self.assertEqual(json.loads(res), json.loads(json_str))
 
+        cur.execute("SELECT CAST(%s AS JSON) AS x", (json_str,))
+        res = cur.fetchone()[0]
+        self.assertEqual(json.loads(res), json.loads(json_str))
+
 
 class TestBulkInserts(base.PyMySQLTestCase):
 
