From 25434e9209af9ee2c05b651bc4fe197541c0bd60 Mon Sep 17 00:00:00 2001 From: Scott Dugas Date: Wed, 22 Oct 2014 15:09:05 -0400 Subject: Support additional args/kwargs on cursor method fdbsql has an optional nested kwarg, which is supported in the actual code, but not in the testing proxy --- lib/sqlalchemy/testing/engines.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/sqlalchemy/testing/engines.py') diff --git a/lib/sqlalchemy/testing/engines.py b/lib/sqlalchemy/testing/engines.py index 67c13231e..75bcc58e1 100644 --- a/lib/sqlalchemy/testing/engines.py +++ b/lib/sqlalchemy/testing/engines.py @@ -284,10 +284,10 @@ class DBAPIProxyCursor(object): """ - def __init__(self, engine, conn): + def __init__(self, engine, conn, *args, **kwargs): self.engine = engine self.connection = conn - self.cursor = conn.cursor() + self.cursor = conn.cursor(*args, **kwargs) def execute(self, stmt, parameters=None, **kw): if parameters: @@ -315,8 +315,10 @@ class DBAPIProxyConnection(object): self.engine = engine self.cursor_cls = cursor_cls - def cursor(self): - return self.cursor_cls(self.engine, self.conn) + def cursor(self, *args, **kwargs): + print "DPA", args + print "DPK", kwargs + return self.cursor_cls(self.engine, self.conn, *args, **kwargs) def close(self): self.conn.close() -- cgit v1.2.1 From ebb9d57cb385f49becbf54c6f78647715ddd1c29 Mon Sep 17 00:00:00 2001 From: Scott Dugas Date: Thu, 30 Oct 2014 16:40:36 -0400 Subject: Removed accidental print statements --- lib/sqlalchemy/testing/engines.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'lib/sqlalchemy/testing/engines.py') diff --git a/lib/sqlalchemy/testing/engines.py b/lib/sqlalchemy/testing/engines.py index 75bcc58e1..3a3f5be10 100644 --- a/lib/sqlalchemy/testing/engines.py +++ b/lib/sqlalchemy/testing/engines.py @@ -316,8 +316,6 @@ class DBAPIProxyConnection(object): self.cursor_cls = cursor_cls def cursor(self, *args, **kwargs): - print "DPA", args - print "DPK", kwargs return self.cursor_cls(self.engine, self.conn, *args, **kwargs) def close(self): -- cgit v1.2.1