Merge pull request #6 from eevee/propagate-reset-on-return

Preserve reset_on_return when recreating a Pool.

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 501b6d2a0ce86e1fef54b2c29a8af3fd6f664787..8b2ba359a10b25fb33859001810dd7f0d348b9f3 100644 (file)
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -575,6 +575,7 @@ class SingletonThreadPool(Pool):
             echo=self.echo,
             logging_name=self._orig_logging_name,
             use_threadlocal=self._use_threadlocal,
+            reset_on_return=self._reset_on_return,
             _dispatch=self.dispatch,
             _dialect=self._dialect)
 
@@ -788,6 +789,7 @@ class QueuePool(Pool):
                           recycle=self._recycle, echo=self.echo,
                           logging_name=self._orig_logging_name,
                           use_threadlocal=self._use_threadlocal,
+                          reset_on_return=self._reset_on_return,
                           _dispatch=self.dispatch,
                           _dialect=self._dialect)
 
@@ -862,6 +864,7 @@ class NullPool(Pool):
             echo=self.echo,
             logging_name=self._orig_logging_name,
             use_threadlocal=self._use_threadlocal,
+            reset_on_return=self._reset_on_return,
             _dispatch=self.dispatch,
             _dialect=self._dialect)
 

diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py
index 9551086f5dbff50cfea30812d1d54d9d64d447d1..ae02417f95597d12dbc9d5b499ddaf571edd68f1 100644 (file)
--- a/test/engine/test_pool.py
+++ b/test/engine/test_pool.py
@@ -1079,9 +1079,10 @@ class QueuePoolTest(PoolTestBase):
         assert c1.connection.id != c_id
 
     def test_recreate(self):
-        p = self._queuepool_fixture(pool_size=1, max_overflow=0)
+        p = self._queuepool_fixture(reset_on_return=None, pool_size=1, max_overflow=0)
         p2 = p.recreate()
         assert p2.size() == 1
+        assert p2._reset_on_return is pool.reset_none
         assert p2._use_threadlocal is False
         assert p2._max_overflow == 0