- Fixed small issue in :class:`.SingletonThreadPool` where the current

connection to be returned might get inadvertently cleaned out during
the "cleanup" process.  Patch courtesy jd23.

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 1591872cdf0735fc42b4e5d86015126defab8377..12b7c8583698d1551c412a422b6cad4730366b28 100644 (file)
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -14,6 +14,13 @@
 .. changelog::
     :version: 0.9.4
 
+    .. change::
+        :tags: bug, pool
+
+        Fixed small issue in :class:`.SingletonThreadPool` where the current
+        connection to be returned might get inadvertently cleaned out during
+        the "cleanup" process.  Patch courtesy jd23.
+
     .. change::
         :tags: bug, ext, py3k
 

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index af9b8fcbcae4d1ef25bccbf35c04595846ad62f0..59c1e614a2f8dc12b4a22a26c45bc198868e4336 100644 (file)
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -817,7 +817,7 @@ class SingletonThreadPool(Pool):
         self._all_conns.clear()
 
     def _cleanup(self):
-        while len(self._all_conns) > self.size:
+        while len(self._all_conns) >= self.size:
             c = self._all_conns.pop()
             c.close()
 
@@ -837,9 +837,9 @@ class SingletonThreadPool(Pool):
             pass
         c = self._create_connection()
         self._conn.current = weakref.ref(c)
-        self._all_conns.add(c)
-        if len(self._all_conns) > self.size:
+        if len(self._all_conns) >= self.size:
             self._cleanup()
+        self._all_conns.add(c)
         return c