summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext/activemapper.py
diff options
context:
space:
mode:
authorAnts Aasma <ants.aasma@gmail.com>2008-01-20 03:22:00 +0000
committerAnts Aasma <ants.aasma@gmail.com>2008-01-20 03:22:00 +0000
commit9f366afdda4b508eb4ef3e626da2fec98ad04773 (patch)
tree62aeb76e50e813fde97134e830b2a0de39e06dc4 /lib/sqlalchemy/ext/activemapper.py
parent4be99db15b7a62b37493c86da07bcc787f44a7df (diff)
downloadsqlalchemy-9f366afdda4b508eb4ef3e626da2fec98ad04773.tar.gz
- parent transactions weren't started on the connection when adding a connection to a nested session transaction.
- session.transaction now always refers to the innermost active transaction, even when commit/rollback are called directly on the session transaction object. - when preparing a two-phase transaction fails on one connection all the connections are rolled back. - two phase transactions can now be prepared. - session.close() didn't close all transactions when nested transactions were used. - rollback() previously erroneously set the current transaction directly to the parent of the transaction that could be rolled back to. - autoflush for commit() wasn't flushing for simple subtransactions.
Diffstat (limited to 'lib/sqlalchemy/ext/activemapper.py')
-rw-r--r--lib/sqlalchemy/ext/activemapper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/activemapper.py b/lib/sqlalchemy/ext/activemapper.py
index b28ada0af..02f4b5b35 100644
--- a/lib/sqlalchemy/ext/activemapper.py
+++ b/lib/sqlalchemy/ext/activemapper.py
@@ -13,7 +13,7 @@ import sys
#
metadata = ThreadLocalMetaData()
Objectstore = scoped_session
-objectstore = scoped_session(sessionmaker(autoflush=True))
+objectstore = scoped_session(sessionmaker(autoflush=True, transactional=False))
#
# declarative column declaration - this is so that we can infer the colname