BUG24948205: Results from JSON_TYPE() are returned as bytearray

isrgomez · isrgomez · commit 0e2bdee7a247 · 2018-02-09T12:01:12.000-06:00
Result value from running a query with JSON_TYPE() is returned
as a VAR_STRING value which is not converted and is returned as
a bytearray. With this patch the returned value will be converted
to a string type using the current charset, in case the conversion
fail the value will still returned as a bytearray value.

v3
diff --git a/lib/mysql/connector/conversion.py b/lib/mysql/connector/conversion.py
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
 
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -559,7 +559,10 @@ def _STRING_to_python(self, value, dsc=None):  # pylint: disable=C0103
             if dsc[7] & FieldFlag.SET:
                 return self._SET_to_python(value, dsc)
             if dsc[7] & FieldFlag.BINARY:
-                return value
+                try:
+                    return value.decode(self.charset)
+                except LookupError:
+                    return value
 
         if self.charset == 'binary':
             return value
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
 
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -52,6 +52,7 @@
 from mysql.connector import (connection, cursor, conversion, protocol,
                              errors, constants, pooling)
 from mysql.connector.optionfiles import read_option_files
+from mysql.connector.catch23 import STRING_TYPES
 import mysql.connector
 import cpy_distutils
 
@@ -4525,3 +4526,24 @@ def test_executemany_utf8mb4(self):
             "INSERT INTO {0} VALUES (%s, %s)".format(self.tbl),
             [(1, "Nuno"), (2, "Amitabh"), (3, "Rafael")]
         )
+
+
+class BugOra24948205(tests.MySQLConnectorTests):
+    """BUG#24948205: RESULT OF JSON_TYPE IS BYTEARRAY INSTEAD OF STR
+    """
+    def setUp(self):
+        config = tests.get_mysql_config()
+        self.tbl = "BugOra24948205"
+        self.cnx = connection.MySQLConnection(**config)
+        self.cur = self.cnx.cursor()
+
+    def test_execute_get_json_type_as_str(self):
+        self.cur.execute("SELECT j, JSON_TYPE(j), 'foo'"
+                         "FROM (SELECT json_object('foo', 'bar') AS j) jdata")
+        data = [('{"foo": "bar"}', 'OBJECT', 'foo')]
+        rows = self.cur.fetchall()
+        self.assertEqual(data, rows)
+        for col in rows[0]:
+            self.assertTrue(isinstance(col, STRING_TYPES),
+                            "{} is type {} and not the expected type "
+                            "string".format(col, type(col)))
diff --git a/tests/test_cursor.py b/tests/test_cursor.py
@@ -321,7 +321,7 @@ def test_next(self):
         self.cur = cursor.MySQLCursor(self.cnx)
         self.assertRaises(StopIteration, self.cur.__next__)
         self.cur.execute("SELECT BINARY 'ham'")
-        exp = (b'ham',)
+        exp = ('ham',)
         self.assertEqual(exp, next(self.cur))
         self.cur.close()
 
@@ -554,7 +554,7 @@ def test_execute(self):
         self.assertTrue(tests.cmp_result(exp, self.cur._warnings))
 
         self.cur.execute("SELECT BINARY 'ham'")
-        exp = [(b'ham',)]
+        exp = [('ham',)]
         self.assertEqual(exp, self.cur.fetchall())
         self.cur.close()
 
@@ -826,7 +826,7 @@ def test_fetchone(self):
         self.cnx = connection.MySQLConnection(**tests.get_mysql_config())
         self.cur = self.cnx.cursor()
         self.cur.execute("SELECT BINARY 'ham'")
-        exp = (b'ham',)
+        exp = ('ham',)
         self.assertEqual(exp, self.cur.fetchone())
         self.assertEqual(None, self.cur.fetchone())
         self.cur.close()
