BUG25589496: Don't convert to unicode if non-ascii data is present

amitab · nmariz · commit 7555f2b50289 · 2017-06-06T11:53:50.000+01:00
In Python 2.7, decoding utf-8 of binary data with non-ascii data is attempted,
decode fails. To fix this error, we attempt to convert the entire mysql
statement to unicode and pass it anyway incase it fails.

Tests added for regression.
diff --git a/lib/mysql/connector/cursor.py b/lib/mysql/connector/cursor.py
@@ -103,15 +103,20 @@ def replace(matchobj):
         if groups["conversion_type"] == b"%":
             value = b"%"
         if groups["conversion_type"] == b"s":
-            key = groups["mapping_key"].encode("utf-8") \
-                  if PY2 else groups["mapping_key"]
+            key = groups["mapping_key"]
             value = value_dict[key]
         if value is None:
             raise ValueError("Unsupported conversion_type: {0}"
                              "".format(groups["conversion_type"]))
-        return value.decode("utf-8") if PY2 else value
-    return RE_PY_MAPPING_PARAM.sub(replace, bytestr.decode("utf-8")
-                                   if PY2 else bytestr)
+        return bytes(value) if PY2 else value
+
+    stmt = RE_PY_MAPPING_PARAM.sub(replace, bytestr)
+    if PY2:
+        try:
+            return stmt.decode("utf-8")
+        except UnicodeDecodeError:
+            pass
+    return stmt
 
 
 class CursorBase(MySQLCursorAbstract):
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -44,6 +44,7 @@
 import traceback
 import time
 import unittest
+import pickle
 
 import tests
 from tests import foreach_cnx, cnx_config
@@ -4305,3 +4306,39 @@ def test_cext_verify_server_certifcate(self):
             mysql.connector.connect, **self.config)
         self.config['ssl_verify_cert'] = False
         mysql.connector.connect(**self.config)
+
+
+class BugOra25589496(tests.MySQLConnectorTests):
+    """BUG#25589496: COMMITS RELATED TO "BUG22529828" BROKE BINARY DATA
+    HANDLING FOR PYTHON 2.7
+    """
+    def setUp(self):
+        config = tests.get_mysql_config()
+        self.cnx = connection.MySQLConnection(**config)
+        self.tbl = "Bug25589496"
+        self.cnx.cmd_query("DROP TABLE IF EXISTS {0}".format(self.tbl))
+
+    def tearDown(self):
+        self.cnx.cmd_query("DROP TABLE IF EXISTS {0}".format(self.tbl))
+        self.cnx.close()
+
+    def test_insert_binary(self):
+        table = """
+        CREATE TABLE {0} (
+            `id` int(10) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
+            `section` VARCHAR(50) NOT NULL,
+            `pickled` LONGBLOB NOT NULL
+        )
+        """.format(self.tbl)
+        cursor = self.cnx.cursor()
+        cursor.execute(table)
+
+        pickled = pickle.dumps({'a': 'b'}, pickle.HIGHEST_PROTOCOL)
+        add_row_q = "INSERT INTO {0} (section, pickled) " \
+                    "VALUES (%(section)s, %(pickled)s)".format(self.tbl)
+
+        new_row = cursor.execute(add_row_q, {'section': 'foo',
+                                             'pickled': pickled})
+        self.cnx.commit()
+        self.assertEqual(1, cursor.lastrowid)
+        cursor.close()
