BUG#21498719: Fix conversion of Python bytearray (c-ext)

nmariz · nmariz · commit 87eff2ab7549 · 2022-02-15T12:08:07.000Z
This patch fixes the error when passing a Python bytearray as a
parameter, using the C extension implementation.

This is an additional fix to the original patch which only fixed
the pure Python implementation.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -19,6 +19,7 @@ v8.0.29
 - BUG#33729842: Character set 'utf8mb3' support
 - BUG#23338623: Add support for Decimal parsing in protocol.py
 - BUG#21528553: Fix API inconsistency when using consume_results=True
+- BUG#21498719: Fix conversion of Python bytearray (c-ext)
 - BUG#20065830: NaN is not supported
 
 v8.0.28
diff --git a/src/mysql_capi.c b/src/mysql_capi.c
@@ -1609,6 +1609,11 @@ MySQL_escape_string(MySQL *self, PyObject *value)
         from_size= PyBytes_Size(value);
         from_str= PyBytes_AsString(value);
     }
+    else if (PyByteArray_Check(value))
+    {
+        from_size= PyByteArray_Size(value);
+        from_str= PyByteArray_AsString(value);
+    }
     else
     {
         PyErr_SetString(PyExc_TypeError, "Argument must be str or bytes");
@@ -2030,7 +2035,8 @@ MySQL_convert_to_mysql(MySQL *self, PyObject *args)
         // All values that need to be quoted
         if (PyUnicode_Check(value)
             || PyUnicode_Check(value)
-            || PyBytes_Check(value))
+            || PyBytes_Check(value)
+            || PyByteArray_Check(value))
         {
             new_value= MySQL_escape_string(self, value);
         }
@@ -3423,6 +3429,11 @@ MySQLPrepStmt_execute(MySQLPrepStmt *self, PyObject *args)
             pbind->str_value= value;
             mbind->buffer_type= MYSQL_TYPE_STRING;
         }
+        else if (PyByteArray_Check(value))
+        {
+            pbind->str_value= PyBytes_FromObject(value);
+            mbind->buffer_type= MYSQL_TYPE_STRING;
+        }
         /* DATETIME */
         else if (PyDateTime_Check(value))
         {
diff --git a/tests/cext/test_cext_cursor.py b/tests/cext/test_cext_cursor.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2014, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2014, 2022, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -692,7 +692,7 @@ class CMySQLCursorPreparedTests(tests.CMySQLCursorTests):
         "abc",
         u"MySQL 🐬",
         "x-large",
-        "random blob data"
+        bytearray(b"random blob data")
     )
 
     exp = (

Original file line number	Diff line number	Diff line change
`@@ -1609,6 +1609,11 @@ MySQL_escape_string(MySQL self, PyObject value)`
`1609`	`1609`	`from_size= PyBytes_Size(value);`
`1610`	`1610`	`from_str= PyBytes_AsString(value);`
`1611`	`1611`	`}`
	`1612`	`+ else if (PyByteArray_Check(value))`
	`1613`	`+ {`
	`1614`	`+ from_size= PyByteArray_Size(value);`
	`1615`	`+ from_str= PyByteArray_AsString(value);`
	`1616`	`+ }`
`1612`	`1617`	`else`
`1613`	`1618`	`{`
`1614`	`1619`	`PyErr_SetString(PyExc_TypeError, "Argument must be str or bytes");`
`@@ -2030,7 +2035,8 @@ MySQL_convert_to_mysql(MySQL self, PyObject args)`
`2030`	`2035`	`// All values that need to be quoted`
`2031`	`2036`	`if (PyUnicode_Check(value)`
`2032`	`2037`	`\|\| PyUnicode_Check(value)`
`2033`		`- \|\| PyBytes_Check(value))`
	`2038`	`+ \|\| PyBytes_Check(value)`
	`2039`	`+ \|\| PyByteArray_Check(value))`
`2034`	`2040`	`{`
`2035`	`2041`	`new_value= MySQL_escape_string(self, value);`
`2036`	`2042`	`}`
`@@ -3423,6 +3429,11 @@ MySQLPrepStmt_execute(MySQLPrepStmt self, PyObject args)`
`3423`	`3429`	`pbind->str_value= value;`
`3424`	`3430`	`mbind->buffer_type= MYSQL_TYPE_STRING;`
`3425`	`3431`	`}`
	`3432`	`+ else if (PyByteArray_Check(value))`
	`3433`	`+ {`
	`3434`	`+ pbind->str_value= PyBytes_FromObject(value);`
	`3435`	`+ mbind->buffer_type= MYSQL_TYPE_STRING;`
	`3436`	`+ }`
`3426`	`3437`	`/* DATETIME */`
`3427`	`3438`	`else if (PyDateTime_Check(value))`
`3428`	`3439`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# -- coding: utf-8 --`
`2`	`2`
`3`		`-# Copyright (c) 2014, 2021, Oracle and/or its affiliates.`
	`3`	`+# Copyright (c) 2014, 2022, Oracle and/or its affiliates.`
`4`	`4`	`#`
`5`	`5`	`# This program is free software; you can redistribute it and/or modify`
`6`	`6`	`# it under the terms of the GNU General Public License, version 2.0, as`
`@@ -692,7 +692,7 @@ class CMySQLCursorPreparedTests(tests.CMySQLCursorTests):`
`692`	`692`	`"abc",`
`693`	`693`	`u"MySQL 🐬",`
`694`	`694`	`"x-large",`
`695`		`- "random blob data"`
	`695`	`+ bytearray(b"random blob data")`
`696`	`696`	`)`
`697`	`697`
`698`	`698`	`exp = (`