]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
fixed [ticket:1471]
authorMike Bayer <mike_mp@zzzcomputing.com>
Sun, 19 Jul 2009 04:06:39 +0000 (04:06 +0000)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sun, 19 Jul 2009 04:06:39 +0000 (04:06 +0000)
lib/sqlalchemy/engine/base.py
test/orm/test_session.py

index feefb88d269b33d8c325fdf32e47cb1d47e0e3b2..332294729d694244dee8388f1bbd63e6bd647437 100644 (file)
@@ -1019,7 +1019,12 @@ class Connection(Connectable):
         return self._execute_clauseelement(func.select(), multiparams, params)
 
     def _execute_default(self, default, multiparams, params):
-        return self.engine.dialect.defaultrunner(self.__create_execution_context()).traverse_single(default)
+        ret = self.engine.dialect.\
+                    defaultrunner(self.__create_execution_context()).\
+                    traverse_single(default)
+        if self.__close_with_result:
+            self.close()
+        return ret
 
     def _execute_ddl(self, ddl, params, multiparams):
         context = self.__create_execution_context(
index 99fffc692f0b171e1e4fb9970039e68eebcbf173..fc91db9af03d983220d76a7b21d51dc4ef7c841f 100644 (file)
@@ -72,9 +72,6 @@ class SessionTest(_fixtures.FixtureTest):
             sess = create_session(bind=testing.db)
             eq_(sess.execute(seq), 1)
         finally:
-            # FIXME: deadlocks Jython without gc_collect
-            # http://www.sqlalchemy.org/trac/ticket/1471
-            gc_collect()
             seq.drop(testing.db)