Fix error packet handling for SSCursor (PyMySQL#810)

ppd0705 · methane · commit f8c31d40c5ab · 2019-09-13T14:16:40.000+09:00
diff --git a/pymysql/connections.py b/pymysql/connections.py
@@ -668,7 +668,10 @@ def _read_packet(self, packet_type=MysqlPacket):
                 break
 
         packet = packet_type(bytes(buff), self.encoding)
-        packet.check_error()
+        if packet.is_error_packet():
+            if self._result is not None and self._result.unbuffered_active is True:
+                self._result.unbuffered_active = False
+            packet.raise_for_error()
         return packet
 
     def _read_bytes(self, num_bytes):
diff --git a/pymysql/protocol.py b/pymysql/protocol.py
@@ -213,11 +213,14 @@ def is_error_packet(self):
 
     def check_error(self):
         if self.is_error_packet():
-            self.rewind()
-            self.advance(1)  # field_count == error (we already know that)
-            errno = self.read_uint16()
-            if DEBUG: print("errno =", errno)
-            err.raise_mysql_exception(self._data)
+            self.raise_for_error()
+
+    def raise_for_error(self):
+        self.rewind()
+        self.advance(1)  # field_count == error (we already know that)
+        errno = self.read_uint16()
+        if DEBUG: print("errno =", errno)
+        err.raise_mysql_exception(self._data)
 
     def dump(self):
         dump_packet(self._data)
