summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/base.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-01 16:20:36 -0500
commit45d0a501609e3588f1accac59c08358c4c6c74a1 (patch)
treec97aafa7c5d1709ff1af8fe9717bd6220c35d0d9 /lib/sqlalchemy/engine/base.py
parent8b108297d075ae68178cd18a9cb4d06feee7e075 (diff)
downloadsqlalchemy-ticket_5648.tar.gz
ensure event handlers called for all do_pingticket_5648
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/engine/base.py')
-rw-r--r--lib/sqlalchemy/engine/base.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index f6c637aa8..09610b069 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -2275,6 +2275,7 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
context,
self._is_disconnect,
invalidate_pool_on_disconnect,
+ False,
)
for fn in self.dialect.dispatch.handle_error:
@@ -2345,6 +2346,7 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
engine: Optional[Engine] = None,
is_disconnect: Optional[bool] = None,
invalidate_pool_on_disconnect: bool = True,
+ is_pre_ping: bool = False,
) -> NoReturn:
exc_info = sys.exc_info()
@@ -2385,6 +2387,7 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]):
None,
is_disconnect,
invalidate_pool_on_disconnect,
+ is_pre_ping,
)
for fn in dialect.dispatch.handle_error:
try:
@@ -2443,6 +2446,7 @@ class ExceptionContextImpl(ExceptionContext):
"execution_context",
"is_disconnect",
"invalidate_pool_on_disconnect",
+ "is_pre_ping",
)
def __init__(
@@ -2458,6 +2462,7 @@ class ExceptionContextImpl(ExceptionContext):
context: Optional[ExecutionContext],
is_disconnect: bool,
invalidate_pool_on_disconnect: bool,
+ is_pre_ping: bool,
):
self.engine = engine
self.dialect = dialect
@@ -2469,6 +2474,7 @@ class ExceptionContextImpl(ExceptionContext):
self.parameters = parameters
self.is_disconnect = is_disconnect
self.invalidate_pool_on_disconnect = invalidate_pool_on_disconnect
+ self.is_pre_ping = is_pre_ping
class Transaction(TransactionalContext):