summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/engine')
-rw-r--r--lib/sqlalchemy/engine/base.py6
-rw-r--r--lib/sqlalchemy/engine/default.py27
-rw-r--r--lib/sqlalchemy/engine/interfaces.py14
3 files changed, 34 insertions, 13 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):
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index f8126fa30..3e4e6fb9a 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -669,16 +669,11 @@ class DefaultDialect(Dialect):
def _dialect_specific_select_one(self):
return str(expression.select(1).compile(dialect=self))
- def do_ping(self, dbapi_connection: DBAPIConnection) -> bool:
- cursor = None
+ def _do_ping_w_event(self, dbapi_connection: DBAPIConnection) -> bool:
try:
- cursor = dbapi_connection.cursor()
- try:
- cursor.execute(self._dialect_specific_select_one)
- finally:
- cursor.close()
+ return self.do_ping(dbapi_connection)
except self.loaded_dbapi.Error as err:
- is_disconnect = self.is_disconnect(err, dbapi_connection, cursor)
+ is_disconnect = self.is_disconnect(err, dbapi_connection, None)
if self._has_events:
try:
@@ -687,19 +682,25 @@ class DefaultDialect(Dialect):
self,
is_disconnect=is_disconnect,
invalidate_pool_on_disconnect=False,
+ is_pre_ping=True,
)
except exc.StatementError as new_err:
is_disconnect = new_err.connection_invalidated
- # other exceptions modified by the event handler will be
- # thrown
-
if is_disconnect:
return False
else:
raise
- else:
- return True
+
+ def do_ping(self, dbapi_connection: DBAPIConnection) -> bool:
+ cursor = None
+
+ cursor = dbapi_connection.cursor()
+ try:
+ cursor.execute(self._dialect_specific_select_one)
+ finally:
+ cursor.close()
+ return True
def create_xid(self):
"""Create a random two-phase transaction ID.
diff --git a/lib/sqlalchemy/engine/interfaces.py b/lib/sqlalchemy/engine/interfaces.py
index c1de13221..9952a85e3 100644
--- a/lib/sqlalchemy/engine/interfaces.py
+++ b/lib/sqlalchemy/engine/interfaces.py
@@ -1967,6 +1967,9 @@ class Dialect(EventTarget):
raise NotImplementedError()
+ def _do_ping_w_event(self, dbapi_connection: DBAPIConnection) -> bool:
+ raise NotImplementedError()
+
def do_ping(self, dbapi_connection: DBAPIConnection) -> bool:
"""ping the DBAPI connection and return True if the connection is
usable."""
@@ -3291,6 +3294,17 @@ class ExceptionContext:
"""
+ is_pre_ping: bool
+ """Indicates if this error is occurring within the "pre-ping" step
+ performed when :paramref:`_sa.create_engine.pool_pre_ping` is set to
+ ``True``. In this mode, the :attr:`.ExceptionContext.engine` attribute
+ will be ``None``. The dialect in use is accessible via the
+ :attr:`.ExceptionContext.dialect` attribute.
+
+ .. versionadded:: 2.0.5
+
+ """
+
class AdaptedConnection:
"""Interface of an adapted connection object to support the DBAPI protocol.