summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/postgresql/asyncpg.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2023-02-24 16:15:21 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2023-03-04 11:00:48 -0500
commit5132237f8ddaab1a8c6bfcaa03aca6487434ae95 (patch)
tree71a92b356920a7ecfc4fffcea04f16f42da971e5 /lib/sqlalchemy/dialects/postgresql/asyncpg.py
parent8b108297d075ae68178cd18a9cb4d06feee7e075 (diff)
downloadsqlalchemy-5132237f8ddaab1a8c6bfcaa03aca6487434ae95.tar.gz
ensure event handlers called for all do_ping
The support for pool ping listeners to receive exception events via the :meth:`.ConnectionEvents.handle_error` event added in 2.0.0b1 for :ticket:`5648` failed to take into account dialect-specific ping routines such as that of MySQL and PostgreSQL. The dialect feature has been reworked so that all dialects participate within event handling. Additionally, a new boolean element :attr:`.ExceptionContext.is_pre_ping` is added which identifies if this operation is occurring within the pre-ping operation. For this release, third party dialects which implement a custom :meth:`_engine.Dialect.do_ping` method can opt in to the newly improved behavior by having their method no longer catch exceptions or check exceptions for "is_disconnect", instead just propagating all exceptions outwards. Checking the exception for "is_disconnect" is now done by an enclosing method on the default dialect, which ensures that the event hook is invoked for all exception scenarios before testing the exception as a "disconnect" exception. If an existing ``do_ping()`` method continues to catch exceptions and check "is_disconnect", it will continue to work as it did previously, but ``handle_error`` hooks will not have access to the exception if it isn't propagated outwards. Fixes: #5648 Change-Id: I6535d5cb389e1a761aad8c37cfeb332c548b876d
Diffstat (limited to 'lib/sqlalchemy/dialects/postgresql/asyncpg.py')
-rw-r--r--lib/sqlalchemy/dialects/postgresql/asyncpg.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/asyncpg.py b/lib/sqlalchemy/dialects/postgresql/asyncpg.py
index e00584503..2acc5fea3 100644
--- a/lib/sqlalchemy/dialects/postgresql/asyncpg.py
+++ b/lib/sqlalchemy/dialects/postgresql/asyncpg.py
@@ -992,15 +992,8 @@ class PGDialect_asyncpg(PGDialect):
return ([], opts)
def do_ping(self, dbapi_connection):
- try:
- dbapi_connection.ping()
- except self.dbapi.Error as err:
- if self.is_disconnect(err, dbapi_connection, None):
- return False
- else:
- raise
- else:
- return True
+ dbapi_connection.ping()
+ return True
@classmethod
def get_pool_class(cls, url):