From: Mike Bayer Date: Fri, 1 Sep 2017 16:31:38 +0000 (-0400) Subject: Add InternalError for mysqlclient disconnect X-Git-Tag: rel_1_1_14~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4be865f79beae79a027561c979286f1dc5bc3fc9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Add InternalError for mysqlclient disconnect mysqlclient as of 1.3.11 changed the exception class for a particular disconnect situation from InterfaceError to InternalError; the disconnection detection logic now accommodates this. Change-Id: I294f90f794491fd363548719222d8e3008480615 Fixes: #4065 (cherry picked from commit 65680b2343ef421a62582e23e2b35293732933ad) --- diff --git a/doc/build/changelog/unreleased_10/4065.rst b/doc/build/changelog/unreleased_10/4065.rst new file mode 100644 index 0000000000..375ce8cf1c --- /dev/null +++ b/doc/build/changelog/unreleased_10/4065.rst @@ -0,0 +1,9 @@ +.. change:: + :tags: bug, mysql + :tickets: 4065 + :versions: 1.2.0b3, 1.1.14 + + mysqlclient as of 1.3.11 changed the exception + class for a particular disconnect situation from + InterfaceError to InternalError; the disconnection + detection logic now accommodates this. diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index 5ccdb1e17b..2dd8b8bac1 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -1638,7 +1638,8 @@ class MySQLDialect(default.DefaultDialect): self.dbapi.ProgrammingError)): return self._extract_error_code(e) in \ (2006, 2013, 2014, 2045, 2055) - elif isinstance(e, self.dbapi.InterfaceError): + elif isinstance( + e, (self.dbapi.InterfaceError, self.dbapi.InternalError)): # if underlying connection is closed, # this is the error you get return "(0, '')" in str(e)