summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2022-09-16 22:28:45 +0000
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>2022-09-16 22:28:45 +0000
commitf582618afe1a5b112a1a22ddd0cbfcc8b97c8f09 (patch)
tree4541afa7991895eabe1ea67c471e9f31548a3a15 /lib/sqlalchemy
parent27e02256560c37bf2dc5203c4f3cdef8ad65d736 (diff)
parent20917c591848792932dfebbe6580276a885385a5 (diff)
downloadsqlalchemy-f582618afe1a5b112a1a22ddd0cbfcc8b97c8f09.tar.gz
Merge "Ignore max_overflow when pool_size is 0" into main
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/pool/impl.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/pool/impl.py b/lib/sqlalchemy/pool/impl.py
index 15ff8c75f..8b328236e 100644
--- a/lib/sqlalchemy/pool/impl.py
+++ b/lib/sqlalchemy/pool/impl.py
@@ -126,7 +126,7 @@ class QueuePool(Pool):
Pool.__init__(self, creator, **kw)
self._pool = self._queue_class(pool_size, use_lifo=use_lifo)
self._overflow = 0 - pool_size
- self._max_overflow = max_overflow
+ self._max_overflow = -1 if pool_size == 0 else max_overflow
self._timeout = timeout
self._overflow_lock = threading.Lock()
@@ -241,7 +241,7 @@ class QueuePool(Pool):
return self._pool.qsize()
def overflow(self) -> int:
- return self._overflow
+ return self._overflow if self._pool.maxsize else 0
def checkedout(self) -> int:
return self._pool.maxsize - self._pool.qsize() + self._overflow