Update sqlalchemy

2012-05-05 01:13:50 +02:00
parent dcaca7294c
commit 710c2aa05f
38 changed files with 2292 additions and 1025 deletions
@@ -108,7 +108,8 @@ class DefaultEngineStrategy(EngineStrategy):
                         'timeout': 'pool_timeout',
                         'recycle': 'pool_recycle',
                         'events':'pool_events',
-                         'use_threadlocal':'pool_threadlocal'}
+                         'use_threadlocal':'pool_threadlocal',
+                         'reset_on_return':'pool_reset_on_return'}
            for k in util.get_cls_kwargs(poolclass):
                tk = translate.get(k, k)
                if tk in kwargs:
@@ -226,6 +227,9 @@ class MockEngineStrategy(EngineStrategy):
        def contextual_connect(self, **kwargs):
            return self

+        def execution_options(self, **kw):
+            return self
+
        def compiler(self, statement, parameters, **kwargs):
            return self._dialect.compiler(
                statement, parameters, engine=self, **kwargs)