diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-10-30 21:49:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-10-30 21:49:24 +0000 |
| commit | af9d3ab9b8a0aaa43e9347fd251a087eebd71e1d (patch) | |
| tree | 60bc6bd9436d41bc8ccdfdaa0e5f3a885213b56f /lib/sqlalchemy/engine | |
| parent | 6b93cf3bac0cddb94246c99ca4ee28e072bbe430 (diff) | |
| parent | b4261c45ab5861e86eb26cc08510fb114db0ec12 (diff) | |
| download | sqlalchemy-af9d3ab9b8a0aaa43e9347fd251a087eebd71e1d.tar.gz | |
Merge "ensure pool.reset event always called for reset" into main
Diffstat (limited to 'lib/sqlalchemy/engine')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/create.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 1ec307297..8cbc0163c 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1220,7 +1220,9 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]): # as we just closed the transaction, close the connection # pool connection without doing an additional reset if skip_reset: - cast("_ConnectionFairy", conn)._close_no_reset() + cast("_ConnectionFairy", conn)._close_special( + transaction_reset=True + ) else: conn.close() diff --git a/lib/sqlalchemy/engine/create.py b/lib/sqlalchemy/engine/create.py index a9b388d71..ef5463972 100644 --- a/lib/sqlalchemy/engine/create.py +++ b/lib/sqlalchemy/engine/create.py @@ -469,7 +469,7 @@ def create_engine(url: Union[str, "_url.URL"], **kwargs: Any) -> Engine: .. seealso:: - :paramref:`_pool.Pool.reset_on_return` + :ref:`pool_reset_on_return` :param pool_timeout=30: number of seconds to wait before giving up on getting a connection from the pool. This is only used |