From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 19 Jul 2009 04:06:39 +0000 (+0000)
Subject: fixed [ticket:1471]
X-Git-Tag: rel_0_6_6~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72ffe8b51702c37f6d7ae9b7460f98229f160f2e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fixed [ticket:1471]
---

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index feefb88d26..332294729d 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -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(
diff --git a/test/orm/test_session.py b/test/orm/test_session.py
index 99fffc692f..fc91db9af0 100644
--- a/test/orm/test_session.py
+++ b/test/orm/test_session.py
@@ -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)