BUG#35912790: Binary strings are converted when using prepared statements

When using a prepared statement cursor in the pure Python implementation,
binary strings are wrongly converted to regular strings.

This patch fixes this issue by checking the binary flag of the field.

Change-Id: I59e89036890ac2ae614b339eaa435cc089bb423d

Author: nmariz

CHANGES.txt

@@ -15,6 +15,7 @@ v8.3.0
 - WL#15983: Stop using mysql_ssl_set api
 - WL#15982: Remove use of mysql_shutdown
 - WL#15942: Improve type hints and standardize byte type handling
+- BUG#35912790: Binary strings are converted when using prepared statements
 
 v8.2.0
 ======

lib/mysql/connector/protocol.py

@@ -798,6 +798,9 @@ def _parse_binary_values(
             elif field[1] == FieldType.TIME:
                 (packet, value) = self._parse_binary_time(packet)
                 values.append(value)
+            elif field[7] == FieldFlag.BINARY or field[8] == 63:  # "binary" charset
+                (packet, value) = utils.read_lc_string(packet)
+                values.append(value)
             else:
                 (packet, value) = utils.read_lc_string(packet)
                 try:

tests/cext/test_cext_cursor.py

@@ -1016,6 +1016,11 @@ def test_execute(self):
         self.assertEqual(len(rows), 1)
         self.assertEqual(rows[0][1:], self.exp)
 
+        # Test binary string
+        self.cur.execute("SELECT BINARY 'ham'")
+        exp = [(bytearray(b"ham"),)]
+        self.assertEqual(exp, self.cur.fetchall())
+
     def test_executemany(self):
         data = [self.data[:], self.data[:]]
         self.cur.executemany(self.insert_stmt.format(self.tbl), data)

tests/test_cursor.py

@@ -1358,6 +1358,11 @@ def test_execute(self):
         stmt = "SELECT SQRT(POW(%(value1)s, 2) + POW(%(unknown)s, 2)) AS hypotenuse"
         self.assertRaises(errors.ProgrammingError, cur.execute, stmt, data)
 
+        # Test binary string
+        cur.execute("SELECT BINARY 'ham'")
+        exp = [(bytearray(b"ham"),)]
+        self.assertEqual(exp, cur.fetchall())
+
     def test_executemany(self):
         cur = self.cnx.cursor(cursor_class=cursor.MySQLCursorPrepared)
 

tests/test_protocol.py

@@ -465,15 +465,15 @@ def test__parse_binary_values(self):
         #
 
         fields = [
-            ("aStr", 253, None, None, None, None, 0, 1),
-            ("aFloat", 246, None, None, None, None, 0, 129),
-            ("aDouble", 246, None, None, None, None, 0, 129),
-            ("aDate", 10, None, None, None, None, 1, 128),
-            ("aDateTime", 12, None, None, None, None, 1, 128),
-            ("aTime", 11, None, None, None, None, 1, 128),
-            ("aNull", 6, None, None, None, None, 1, 128),
-            ("aBlob", 252, None, None, None, None, 1, 144),
-            ("aVarBinary", 253, None, None, None, None, 1, 128),
+            ("aStr", 253, None, None, None, None, 0, 1, 45),
+            ("aFloat", 246, None, None, None, None, 0, 129, 63),
+            ("aDouble", 246, None, None, None, None, 0, 129, 63),
+            ("aDate", 10, None, None, None, None, 1, 128, 63),
+            ("aDateTime", 12, None, None, None, None, 1, 128, 63),
+            ("aTime", 11, None, None, None, None, 1, 128, 63),
+            ("aNull", 6, None, None, None, None, 1, 128, 63),
+            ("aBlob", 252, None, None, None, None, 1, 144, 63),
+            ("aVarBinary", 253, None, None, None, None, 1, 128, 63),
         ]
 
         packet = bytearray(