BUG#34217492: Exec of stored procedures with args fails when db prefix used

MySQL itself does support calling procedures with their full name
<db>.<procname>, however when calling the Connector/Python
cursor.callproc() method following the before mention structure,
it arises a ProgrammingError complaining about the syntax.

With this patch, the issue is fixed. From now on, the
<db>.<procname> syntax is acceptable.

Change-Id: I5b8ec54e56bbbbabbfad1ce2a5a601a123058b53

Author: oscpache

CHANGES.txt

@@ -12,6 +12,7 @@ v8.0.31
 =======
 
 - BUG#34283402: Binary data starting with 0x00 are returned as empty string
+- BUG#34217492: Exec of stored procedures with args fails when db prefix used
 - BUG#28491115: Connector/Python crashes on 0 time value
 - BUG#28295478: Align exception types raised by pure Python and c-ext
 - BUG#27634910: Add warning count method to cursors

lib/mysql/connector/cursor.py

@@ -734,9 +734,14 @@ def callproc(self, procname, args=()):
         try:
             argnames = []
             argtypes = []
+
+            # MySQL itself does support calling procedures with their full
+            # name <database>.<procedure_name>. It's necessary to split
+            # by '.' and grab the procedure name from procname.
+            procname_abs = procname.split(".")[-1]
             if args:
                 for idx, arg in enumerate(args):
-                    argname = argfmt.format(name=procname, index=idx + 1)
+                    argname = argfmt.format(name=procname_abs, index=idx + 1)
                     argnames.append(argname)
                     if isinstance(arg, tuple):
                         argtypes.append(f" CAST({argname} AS {arg[1]})")

lib/mysql/connector/cursor_cext.py

@@ -430,9 +430,14 @@ def callproc(self, procname, args=()):
         try:
             argnames = []
             argtypes = []
+
+            # MySQL itself does support calling procedures with their full
+            # name <database>.<procedure_name>. It's necessary to split
+            # by '.' and grab the procedure name from procname.
+            procname_abs = procname.split(".")[-1]
             if args:
                 for idx, arg in enumerate(args):
-                    argname = argfmt.format(name=procname, index=idx + 1)
+                    argname = argfmt.format(name=procname_abs, index=idx + 1)
                     argnames.append(argname)
                     if isinstance(arg, tuple):
                         argtypes.append(f" CAST({argname} AS {arg[1]})")

tests/cext/test_cext_cursor.py

@@ -300,12 +300,22 @@ def _test_callproc_setup(self, cnx):
             "BEGIN SET pConCat := CONCAT(pStr1, pStr2); END;"
         )
 
+        stmt_create5 = f"""
+            CREATE PROCEDURE {cnx.database}.myconnpy_sp_5(IN user_value INT)
+            BEGIN
+                SET @user_value = user_value;
+                SELECT @user_value AS 'user_value', CURRENT_TIMESTAMP as
+                'timestamp';
+            END
+        """
+
         try:
             cur = cnx.cursor()
             cur.execute(stmt_create1)
             cur.execute(stmt_create2)
             cur.execute(stmt_create3)
             cur.execute(stmt_create4)
+            cur.execute(stmt_create5)
         except errors.Error as err:
             self.fail("Failed setting up test stored routine; {0}".format(err))
         cur.close()
@@ -317,6 +327,7 @@ def _test_callproc_cleanup(self, cnx):
             "myconnpy_sp_2",
             "myconnpy_sp_3",
             "myconnpy_sp_4",
+            f"{cnx.database}.myconnpy_sp_5",
         )
         stmt_drop = "DROP PROCEDURE IF EXISTS {procname}"
 
@@ -370,6 +381,11 @@ def test_callproc(self):
         self.assertTrue(isinstance(cur._stored_results, list))
         self.assertEqual(exp, result)
 
+        exp = (5,)
+        result = cur.callproc(f"{self.cnx.database}.myconnpy_sp_5", exp)
+        self.assertTrue(isinstance(cur._stored_results, list))
+        self.assertEqual(exp, result)
+
         cur.close()
         self._test_callproc_cleanup(self.cnx)
 

tests/test_cursor.py

@@ -801,12 +801,22 @@ def _test_callproc_setup(self, cnx):
             "BEGIN SET pConCat := CONCAT(pStr1, pStr2); END;"
         )
 
+        stmt_create5 = f"""
+            CREATE PROCEDURE {cnx.database}.myconnpy_sp_5(IN user_value INT)
+            BEGIN
+                SET @user_value = user_value;
+                SELECT @user_value AS 'user_value', CURRENT_TIMESTAMP as
+                'timestamp';
+            END
+        """
+
         try:
             cur = cnx.cursor()
             cur.execute(stmt_create1)
             cur.execute(stmt_create2)
             cur.execute(stmt_create3)
             cur.execute(stmt_create4)
+            cur.execute(stmt_create5)
         except errors.Error as err:
             self.fail("Failed setting up test stored routine; {0}".format(err))
         cur.close()
@@ -818,6 +828,7 @@ def _test_callproc_cleanup(self, cnx):
             "myconnpy_sp_2",
             "myconnpy_sp_3",
             "myconnpy_sp_4",
+            f"{cnx.database}.myconnpy_sp_5",
         )
         stmt_drop = "DROP PROCEDURE IF EXISTS {procname}"
 
@@ -874,6 +885,11 @@ def test_callproc(self):
         self.assertTrue(isinstance(self.cur._stored_results, list))
         self.assertEqual(exp, result)
 
+        exp = (5,)
+        result = self.cur.callproc(f"{self.cnx.database}.myconnpy_sp_5", exp)
+        self.assertTrue(isinstance(self.cur._stored_results, list))
+        self.assertEqual(exp, result)
+
         self._test_callproc_cleanup(self.cnx)
         self.cur.close()