BUG19207922: Fix fetching multiple results executing procedures

Geert Vanderkelen · Geert Vanderkelen · commit cd11c7e2dce1 · 2014-07-15T08:38:14.000+02:00
A stored procedure is generally called or executed using the
MySQLCursor.callprc() method. However, there is a need to
improve MySQLCursor making it possible to return multiple
results when executing stored routines using the
execute() method.

Test cases were updated.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -11,6 +11,7 @@ Full release notes:
 v2.0.0a1
 ========
 
+- BUG19207922: Fix fetching multiple results when executing procedure
 - BUG19184025: Fix results containing NULL
 - BUG19169990: Fix sending/receiving using compressed connection
 - BUG18956789: Fix Django TimeField 00:00:00 converting to MySQL NULL
diff --git a/cpyint b/cpyint
@@ -1 +1 @@
-Subproject commit 0fc750446cae19304f099aea4bf395b7838ea068
+Subproject commit e1ce6eb6e5fba350c1cf68bf48a88e49e8e4f384
diff --git a/lib/mysql/connector/connection.py b/lib/mysql/connector/connection.py
@@ -159,7 +159,12 @@ def _do_handshake(self):
             raise errors.InterfaceError("Failed parsing MySQL version")
 
         version = tuple([int(v) for v in match.groups()[0:3]])
-        if version < (4, 1):
+        if b'fabric' in match.group(4).lower():
+            if version < (1, 4):
+                raise errors.InterfaceError(
+                    "MySQL Fabric '{0}'' is not supported".format(
+                        handshake['server_version_original']))
+        elif version < (4, 1):
             raise errors.InterfaceError(
                 "MySQL Version '{0}' is not supported.".format(
                     handshake['server_version_original']))
diff --git a/lib/mysql/connector/conversion.py b/lib/mysql/connector/conversion.py
@@ -185,6 +185,10 @@ def _bytes_to_mysql(self, value):
         """Convert value to bytes"""
         return value
 
+    def _bytearray_to_mysql(self, value):
+        """Convert value to bytes"""
+        return str(value)
+
     def _bool_to_mysql(self, value):
         """Convert value to boolean"""
         if value:
diff --git a/lib/mysql/connector/cursor.py b/lib/mysql/connector/cursor.py
@@ -434,14 +434,19 @@ def _execute_iter(self, query_iter):
         given query_iter (result of MySQLConnection.cmd_query_iter()) and
         the list of statements that were executed.
         """
-        if not self._executed_list:
-            self._executed_list = RE_SQL_SPLIT_STMTS.split(self._executed)
+        executed_list = RE_SQL_SPLIT_STMTS.split(self._executed)
 
-        for stmt in self._executed_list:
+        i = 0
+        while True:
             result = next(query_iter)
             self._reset_result()
             self._handle_result(result)
-            self._executed = stmt
+            try:
+                self._executed = executed_list[i].strip()
+                i += 1
+            except IndexError:
+                self._executed = executed_list[0]
+
             yield self
 
     def execute(self, operation, params=None, multi=False):
diff --git a/tests/test_cursor.py b/tests/test_cursor.py
@@ -39,6 +39,7 @@
 import re
 import time
 
+from . import PY2
 import tests
 from mysql.connector import (connection, cursor, errors)
 
@@ -567,6 +568,26 @@ def test_execute(self):
         self._test_execute_cleanup(self.cnx, tbl)
         self.cur.close()
 
+        self.cur = self.cnx.cursor()
+        self.cur.execute("DROP PROCEDURE IF EXISTS multi_results")
+        procedure = (
+            "CREATE PROCEDURE multi_results () "
+            "BEGIN SELECT 1; SELECT 'ham'; END"
+        )
+        self.cur.execute(procedure)
+        exp_stmt = "CALL multi_results()"
+        if not PY2:
+            exp_stmt = b"CALL multi_results()"
+        exp_result = [[(1,)], [(u'ham',)]]
+        results = []
+        for result in self.cur.execute(exp_stmt, multi=True):
+            if result.with_rows:
+                self.assertEqual(exp_stmt, result._executed)
+                results.append(result.fetchall())
+
+        self.assertEqual(exp_result, results)
+        self.cur.execute("DROP PROCEDURE multi_results")
+
     def test_executemany(self):
         """MySQLCursor object executemany()-method"""
         self.check_method(self.cur, 'executemany')
