diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2019-01-24 21:35:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2019-01-24 21:35:55 +0000 |
| commit | 99b7dd4512364f1f1f11212fd87355ea098a93a6 (patch) | |
| tree | 910bc3099afd3e13ef6da753d037ce6fe06d127e | |
| parent | a11a5f5af6b0c76d6f07a7ed3dd8eff7dda95ed6 (diff) | |
| parent | f9c9f6453a7ed4b9ad01f6d4d808f5cd273f8290 (diff) | |
| download | sqlalchemy-99b7dd4512364f1f1f11212fd87355ea098a93a6.tar.gz | |
Merge "Provide public accessor for Pool.timeout()."
| -rw-r--r-- | doc/build/changelog/unreleased_13/3689.rst | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/pool/impl.py | 3 | ||||
| -rw-r--r-- | test/engine/test_pool.py | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/doc/build/changelog/unreleased_13/3689.rst b/doc/build/changelog/unreleased_13/3689.rst new file mode 100644 index 000000000..80ab78d01 --- /dev/null +++ b/doc/build/changelog/unreleased_13/3689.rst @@ -0,0 +1,6 @@ +.. change:: + :tags: feature, engine + :tickets: 3689 + + Added public accessor :meth:`.Pool.timeout` that returns the configured + timeout for a :class:`.Pool` object. Pull request courtesy Irina Delamare. diff --git a/lib/sqlalchemy/pool/impl.py b/lib/sqlalchemy/pool/impl.py index 768921423..ada319661 100644 --- a/lib/sqlalchemy/pool/impl.py +++ b/lib/sqlalchemy/pool/impl.py @@ -201,6 +201,9 @@ class QueuePool(Pool): def size(self): return self._pool.maxsize + def timeout(self): + return self._timeout + def checkedin(self): return self._pool.qsize() diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py index feff61b88..45e136260 100644 --- a/test/engine/test_pool.py +++ b/test/engine/test_pool.py @@ -774,6 +774,12 @@ class QueuePoolTest(PoolTestBase): lazy_gc() assert not pool._refs + def test_timeout_accessor(self): + expected_timeout = 123 + p = self._queuepool_fixture( + timeout=expected_timeout) + eq_(p.timeout(), expected_timeout) + @testing.requires.timing_intensive def test_timeout(self): p = self._queuepool_fixture(pool_size=3, max_overflow=0, timeout=2) |