From 66b7de5fdbe9bc07a798c359e8a45114e3293039 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 10 Aug 2006 19:17:45 +0000 Subject: [PATCH] moved rollback catch to mysql module... --- lib/sqlalchemy/databases/mysql.py | 7 +++++++ lib/sqlalchemy/engine/default.py | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py index 7e337b9a35..2ce7e98259 100644 --- a/lib/sqlalchemy/databases/mysql.py +++ b/lib/sqlalchemy/databases/mysql.py @@ -297,6 +297,13 @@ class MySQLDialect(ansisql.ANSIDialect): def schemadropper(self, *args, **kwargs): return MySQLSchemaDropper(*args, **kwargs) + def do_rollback(self, connection): + # some versions of MySQL just dont support rollback() at all.... + try: + connection.rollback() + except: + pass + def get_default_schema_name(self): if not hasattr(self, '_default_schema_name'): self._default_schema_name = text("select database()", self).scalar() diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index 2f8e1c2289..f0ffd7797e 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -73,10 +73,7 @@ class DefaultDialect(base.Dialect): """implementations might want to put logic here for turning autocommit on/off, etc.""" #print "ENGINE ROLLBACK ON ", connection.connection - try: - connection.rollback() - except: - pass + connection.rollback() def do_commit(self, connection): """implementations might want to put logic here for turning autocommit on/off, etc.""" #print "ENGINE COMMIT ON ", connection.connection -- 2.47.2