From: mike bayer <mike_mp@zzzcomputing.com>
Date: Mon, 10 Jun 2013 23:38:48 +0000 (-0700)
Subject: Merge pull request #6 from eevee/propagate-reset-on-return
X-Git-Tag: rel_0_8_2~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ee99da9eb2feb356be2ddb0294a7151b3d3f4b;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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 501b6d2a0c..8b2ba359a1 100644
--- 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 9551086f5d..ae02417f95 100644
--- 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