From 0707c94d630966ef677acafecf90f7c6884de1ce Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 9 Jun 2010 11:07:57 -0400 Subject: [PATCH] - Fixed incorrect signature in do_execute() for firebird, access, error introduced in 0.6.1. [ticket:1823] --- CHANGES | 4 ++++ lib/sqlalchemy/dialects/access/base.py | 2 +- lib/sqlalchemy/dialects/firebird/base.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index bc6e0d57a2..53d2a8e054 100644 --- a/CHANGES +++ b/CHANGES @@ -9,6 +9,10 @@ CHANGES - Fixed bug in Enum type which blew away native_enum flag when used with TypeDecorators or other adaption scenarios. + +- firebird + - Fixed incorrect signature in do_execute(), error + introduced in 0.6.1. [ticket:1823] 0.6.1 ===== diff --git a/lib/sqlalchemy/dialects/access/base.py b/lib/sqlalchemy/dialects/access/base.py index 2b76b93d03..7d92708771 100644 --- a/lib/sqlalchemy/dialects/access/base.py +++ b/lib/sqlalchemy/dialects/access/base.py @@ -194,7 +194,7 @@ class AccessDialect(default.DefaultDialect): def last_inserted_ids(self): return self.context.last_inserted_ids - def do_execute(self, cursor, statement, params, **kwargs): + def do_execute(self, cursor, statement, params, context=None): if params == {}: params = () super(AccessDialect, self).do_execute(cursor, statement, params, **kwargs) diff --git a/lib/sqlalchemy/dialects/firebird/base.py b/lib/sqlalchemy/dialects/firebird/base.py index 4980800399..0d3143b3bd 100644 --- a/lib/sqlalchemy/dialects/firebird/base.py +++ b/lib/sqlalchemy/dialects/firebird/base.py @@ -605,7 +605,7 @@ class FBDialect(default.DefaultDialect): return indexes.values() - def do_execute(self, cursor, statement, parameters, **kwargs): + def do_execute(self, cursor, statement, parameters, context=None): # kinterbase does not accept a None, but wants an empty list # when there are no arguments. cursor.execute(statement, parameters or []) -- 2.47.2