BUG19777815: Add support for warnings with MySQLCursor.callproc()

peeyushgupta · peeyushgupta · commit 3889e8665f3c · 2014-12-12T12:11:29.000+05:30
MySQLCursor.fetchwarnings() was not returning any warnings even
when warnings were generated by calling a stored procedure using
MySQLCursor.callproc() method. We add support to fetch warnings
generated by a stored procedure.

A unit test has been added for BUG#19777815.
diff --git a/lib/mysql/connector/cursor.py b/lib/mysql/connector/cursor.py
@@ -697,12 +697,14 @@ def callproc(self, procname, args=()):
             call = "CALL {0}({1})".format(procname, ','.join(argnames))
 
             for result in self._connection.cmd_query_iter(call):
+                # pylint: disable=W0212
+                tmp = MySQLCursorBuffered(self._connection._get_self())
+                tmp._handle_result(result)
+                if tmp._warnings is not None:
+                    self._warnings = tmp._warnings
+                # pylint: enable=W0212
                 if 'columns' in result:
-                    # pylint: disable=W0212
-                    tmp = MySQLCursorBuffered(self._connection._get_self())
-                    tmp._handle_result(result)
                     results.append(tmp)
-                    # pylint: enable=W0212
 
             if argnames:
                 select = "SELECT {0}".format(','.join(argtypes))
diff --git a/tests/test_bugs.py b/tests/test_bugs.py
@@ -3050,3 +3050,54 @@ def tearDown(self):
         self.cur.execute("DROP TABLE IF EXISTS {0}".format(self.tbl))
         self.cur.close()
         self.cnx.close()
+
+
+
+class BugOra19777815(tests.MySQLConnectorTests):
+    """BUG#19777815:  CALLPROC() DOES NOT SUPPORT WARNINGS
+    """
+    def setUp(self):
+        config = tests.get_mysql_config()
+        config['get_warnings'] = True
+        self.cnx = connection.MySQLConnection(**config)
+        cur = self.cnx.cursor()
+        self.sp1 = 'BUG19777815'
+        self.sp2 = 'BUG19777815_with_result'
+        create1 = (
+            "CREATE PROCEDURE {0}() BEGIN SIGNAL SQLSTATE '01000' "
+            "SET MESSAGE_TEXT = 'TEST WARNING'; END;".format(self.sp1)
+        )
+        create2 = (
+            "CREATE PROCEDURE {0}() BEGIN SELECT 1; SIGNAL SQLSTATE '01000' "
+            "SET MESSAGE_TEXT = 'TEST WARNING'; END;".format(self.sp2)
+        )
+
+        cur.execute("DROP PROCEDURE IF EXISTS {0}".format(self.sp1))
+        cur.execute("DROP PROCEDURE IF EXISTS {0}".format(self.sp2))
+        cur.execute(create1)
+        cur.execute(create2)
+        cur.close()
+
+    def tearDown(self):
+        cur = self.cnx.cursor()
+        cur.execute("DROP PROCEDURE IF EXISTS {0}".format(self.sp1))
+        cur.execute("DROP PROCEDURE IF EXISTS {0}".format(self.sp2))
+        cur.close()
+        self.cnx.close()
+
+    def test_warning(self):
+        cur = self.cnx.cursor()
+        cur.callproc(self.sp1)
+        exp = [(u'Warning', 1642, u'TEST WARNING')]
+        self.assertEqual(exp, cur.fetchwarnings())
+        cur.close()
+
+    def test_warning_with_rows(self):
+        cur = self.cnx.cursor()
+        cur.callproc(self.sp2)
+
+        exp = [(1,)]
+        self.assertEqual(exp, cur.stored_results().next().fetchall())
+        exp = [(u'Warning', 1642, u'TEST WARNING')]
+        self.assertEqual(exp, cur.fetchwarnings())
+        cur.close()
