Fix SSCursor raising query timeout error on wrong query on MySQL DB (#761)

Nothing4You · web-flow · commit 1e474e66a3fe · 2022-04-11T02:09:44.000+02:00
ports PyMySQL/PyMySQL@dd0f854 from PyMySQL/PyMySQL#1035 fixes #428
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -25,6 +25,7 @@ To be included in 1.0.0 (unreleased)
 * Add rsa extras_require depending on PyMySQL[rsa] #557
 * Migrate to PEP 517 build system #746
 * Self-reported `__version__` now returns version generated by `setuptools-scm` during build, otherwise `'unknown'` #748
+* Fix SSCursor raising query timeout error on wrong query #428
 
 
 0.0.22 (2021-11-14)
diff --git a/aiomysql/connection.py b/aiomysql/connection.py
@@ -1247,7 +1247,22 @@ async def _finish_unbuffered_query(self):
         # in fact, no way to stop MySQL from sending all the data after
         # executing a query, so we just spin, and wait for an EOF packet.
         while self.unbuffered_active:
-            packet = await self.connection._read_packet()
+            try:
+                packet = await self.connection._read_packet()
+            except OperationalError as e:
+                # TODO: replace these numbers with constants when available
+                # TODO: in a new PyMySQL release
+                if e.args[0] in (
+                    3024,  # ER.QUERY_TIMEOUT
+                    1969,  # ER.STATEMENT_TIMEOUT
+                ):
+                    # if the query timed out we can simply ignore this error
+                    self.unbuffered_active = False
+                    self.connection = None
+                    return
+
+                raise
+
             if self._check_packet_is_eof(packet):
                 self.unbuffered_active = False
                 # release reference to kill cyclic reference.
