- Fixed incorrect signature in do_execute() for firebird, access, error

introduced in 0.6.1. [ticket:1823]

diff --git a/CHANGES b/CHANGES
index bc6e0d57a27da06134ae9f91124012b48ab6f41c..53d2a8e0549b4465b8e09df8aeeab11c2d6ce226 100644 (file)
--- 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 2b76b93d03dd9dd24d3f0097119b302677aa668e..7d92708771bbe9c05547911c503aa1a2a2ab89fb 100644 (file)
--- 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 49808003998bfe6b38ff168b897721df76b65a65..0d3143b3bd8c6c3214964a57f229eb26411627ad 100644 (file)
--- 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 [])