summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/__init__.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2018-08-28 14:58:05 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2018-08-28 14:58:46 -0400
commitd8bb208a85f6366c58426a85b3d4ec1d6e43ac6c (patch)
tree4ecd0dec8877906d201332150909e42986c9dbef /lib/sqlalchemy/engine/__init__.py
parente6c2a651597e8be0d32d688b44bacd4d8a31f79c (diff)
downloadsqlalchemy-d8bb208a85f6366c58426a85b3d4ec1d6e43ac6c.tar.gz
Fix links and update verbiage for reset_on_return
Change-Id: I642056b78570b44fdefe7f0874a8e4c720389f14
Diffstat (limited to 'lib/sqlalchemy/engine/__init__.py')
-rw-r--r--lib/sqlalchemy/engine/__init__.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/sqlalchemy/engine/__init__.py b/lib/sqlalchemy/engine/__init__.py
index 841dc405e..b0d765b8e 100644
--- a/lib/sqlalchemy/engine/__init__.py
+++ b/lib/sqlalchemy/engine/__init__.py
@@ -386,13 +386,14 @@ def create_engine(*args, **kwargs):
:ref:`pool_setting_recycle`
- :param pool_reset_on_return='rollback': set the "reset on return"
- behavior of the pool, which is whether ``rollback()``,
- ``commit()``, or nothing is called upon connections
- being returned to the pool. See the docstring for
- ``reset_on_return`` at :class:`.Pool`.
+ :param pool_reset_on_return='rollback': set the
+ :paramref:`.Pool.reset_on_return` parameter of the underlying
+ :class:`.Pool` object, which can be set to the values
+ ``"rollback"``, ``"commit"``, or ``None``.
- .. versionadded:: 0.7.6
+ .. seealso::
+
+ :paramref:`.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