From c931b9d9d1e6dd7ed1fd2dbb5437ab31dd872721 Mon Sep 17 00:00:00 2001 From: Ants Aasma Date: Mon, 8 Oct 2007 16:11:08 +0000 Subject: - a better fix for [ticket:810]. The cause was two phase commit/rollback not opening a new transaction as the dbapi implementations do. --- lib/sqlalchemy/databases/postgres.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib/sqlalchemy/databases/postgres.py') diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py index 345893524..5d6773789 100644 --- a/lib/sqlalchemy/databases/postgres.py +++ b/lib/sqlalchemy/databases/postgres.py @@ -306,9 +306,6 @@ class PGDialect(default.DefaultDialect): return sqltypes.adapt_type(typeobj, colspecs) def do_begin_twophase(self, connection, xid): - # Two phase transactions seem to require that the transaction is explicitly started. - # The implicit transactions that usually work aren't enough. - connection.execute(sql.text("BEGIN")) self.do_begin(connection.connection) def do_prepare_twophase(self, connection, xid): @@ -321,6 +318,7 @@ class PGDialect(default.DefaultDialect): # Must find out a way how to make the dbapi not open a transaction. connection.execute(sql.text("ROLLBACK")) connection.execute(sql.text("ROLLBACK PREPARED %(tid)s", bindparams=[sql.bindparam('tid', xid)])) + connection.execute(sql.text("BEGIN")) else: self.do_rollback(connection.connection) @@ -329,6 +327,7 @@ class PGDialect(default.DefaultDialect): if recover: connection.execute(sql.text("ROLLBACK")) connection.execute(sql.text("COMMIT PREPARED %(tid)s", bindparams=[sql.bindparam('tid', xid)])) + connection.execute(sql.text("BEGIN")) else: self.do_commit(connection.connection) -- cgit v1.2.1