Don't fetch warnings when there is next result

methane · methane · commit b07937487dc1 · 2015-10-12T02:29:06.000+09:00
Fixes PyMySQL#48
diff --git a/MySQLdb/cursors.py b/MySQLdb/cursors.py
@@ -109,6 +109,14 @@ def _check_executed(self):
     def _warning_check(self):
         from warnings import warn
         if self._warnings:
+            # When there is next result, fetching warnings cause "command
+            # out of sync" error.
+            if self._result.has_next:
+                msg = "There are %d MySQL warnings." % (self._warnings,)
+                self.messages.append(msg)
+                warn(msg, self.Warning, 3)
+                return
+
             warnings = self._get_db().show_warnings()
             if warnings:
                 # This is done in two loops in case
@@ -204,23 +212,21 @@ def execute(self, query, args=None):
         if isinstance(query, unicode):
             query = query.encode(db.unicode_literal.charset, 'surrogateescape')
 
+        res = None
         try:
-            r = None
-            r = self._query(query)
+            res = self._query(query)
         except TypeError as m:
             if m.args[0] in ("not enough arguments for format string",
                              "not all arguments converted"):
                 self.errorhandler(self, ProgrammingError, m.args[0])
             else:
                 self.errorhandler(self, TypeError, m)
-        except (SystemExit, KeyboardInterrupt):
-            raise
-        except:
+        except Exception:
             exc, value = sys.exc_info()[:2]
             self.errorhandler(self, exc, value)
         self._executed = query
         if not self._defer_warnings: self._warning_check()
-        return r
+        return res
 
     def executemany(self, query, args):
         """Execute a multi-row query.
diff --git a/_mysql.c b/_mysql.c
@@ -88,6 +88,7 @@ typedef struct {
 	MYSQL_RES *result;
 	int nfields;
 	int use;
+	char has_next;
 	PyObject *converter;
 } _mysql_ResultObject;
 
@@ -406,6 +407,7 @@ _mysql_ResultObject_Initialize(
 	else
 		result = mysql_store_result(&(conn->connection));
 	self->result = result;
+	self->has_next = (char)mysql_more_results(&(conn->connection));
 	Py_END_ALLOW_THREADS ;
 	if (!result) {
 		if (mysql_errno(&(conn->connection))) {
@@ -1520,7 +1522,7 @@ _mysql__fetch_row(
 	int maxrows,
 	_PYFUNC *convert_row)
 {
-	unsigned int i;
+	int i;
 	MYSQL_ROW row;
 
 	for (i = skiprows; i<(skiprows+maxrows); i++) {
@@ -1573,14 +1575,14 @@ _mysql_ResultObject_fetch_row(
 		_mysql_row_to_dict_old
 	};
 	_PYFUNC *convert_row;
-	unsigned int maxrows=1, how=0, skiprows=0, rowsadded;
+	int maxrows=1, how=0, skiprows=0, rowsadded;
 	PyObject *r=NULL;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|ii:fetch_row", kwlist,
 					 &maxrows, &how))
 		return NULL;
 	check_result_connection(self);
-	if (how >= sizeof(row_converters)) {
+	if (how >= (int)sizeof(row_converters)) {
 		PyErr_SetString(PyExc_ValueError, "how out of range");
 		return NULL;
 	}
@@ -2653,6 +2655,13 @@ static struct PyMemberDef _mysql_ResultObject_memberlist[] = {
 		READONLY,
 		"Type conversion mapping"
 	},
+	{
+		"has_next",
+		T_BOOL,
+		offsetof(_mysql_ResultObject, has_next),
+		READONLY,
+		"Has next result"
+	},
 	{NULL} /* Sentinel */
 };
 
