Merge pull request PyMySQL#406 from methane/fix/result-sync

methane · methane · commit dbb16ee42e11 · 2016-01-05T10:12:10.000+09:00
Calling connection's method during multiple result breaks command sync
diff --git a/pymysql/connections.py b/pymysql/connections.py
@@ -1021,10 +1021,13 @@ def _execute_command(self, command, sql):
 
         # If the last query was unbuffered, make sure it finishes before
         # sending new commands
-        if self._result is not None and self._result.unbuffered_active:
-            warnings.warn("Previous unbuffered result was left incomplete")
-            self._result._finish_unbuffered_query()
-        self._result = None
+        if self._result is not None:
+            if self._result.unbuffered_active:
+                warnings.warn("Previous unbuffered result was left incomplete")
+                self._result._finish_unbuffered_query()
+            while self._result.has_next:
+                self.next_result()
+            self._result = None
 
         if isinstance(sql, text_type):
             sql = sql.encode(self.encoding)
@@ -1113,9 +1116,6 @@ def _request_authentication(self):
                 self.write_packet(data)
                 auth_packet = self._read_packet()
 
-        #TODO: ok packet or error packet?
-
-
     def _process_auth(self, plugin_name, auth_packet):
         plugin_class = self._auth_plugin_map.get(plugin_name)
         if not plugin_class:
diff --git a/pymysql/tests/test_connection.py b/pymysql/tests/test_connection.py
@@ -418,7 +418,7 @@ def test_connection_gone_away(self):
         with self.assertRaises(pymysql.OperationalError) as cm:
             cur.execute("SELECT 1+1")
         # error occures while reading, not writing because of socket buffer.
-        #self.assertEquals(cm.exception.args[0], 2006)
+        #self.assertEqual(cm.exception.args[0], 2006)
         self.assertIn(cm.exception.args[0], (2006, 2013))
 
     def test_init_command(self):
@@ -566,3 +566,11 @@ def test_previous_cursor_not_closed(self):
         cur2 = con.cursor()
         with self.assertRaises(pymysql.ProgrammingError):
             cur2.execute("SELECT 3")
+
+    def test_commit_during_multi_result(self):
+        con = self.connections[0]
+        cur = con.cursor()
+        cur.execute("SELECT 1; SELECT 2")
+        con.commit()
+        cur.execute("SELECT 3")
+        self.assertEqual(cur.fetchone()[0], 3)
