summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-02-13 20:21:18 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-02-13 20:21:18 -0500
commit472fcea10aaf264c2980733b33e25c76c2a927cb (patch)
tree386dc8a736522493514d2e8be48d150bd2d44a0b
parentdf15546cb8903e0eef0182faa0eda1691bf6bac8 (diff)
downloadsqlalchemy-472fcea10aaf264c2980733b33e25c76c2a927cb.tar.gz
- [bug] Added execution_options() call to
MockConnection (i.e., that used with strategy="mock") which acts as a pass through for arguments.
-rw-r--r--CHANGES5
-rw-r--r--lib/sqlalchemy/engine/strategies.py3
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index a25c5f45a..438e8520b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -86,6 +86,11 @@ CHANGES
time if parameters will be present in
some cases). [ticket:2407]
+ - [bug] Added execution_options() call to
+ MockConnection (i.e., that used with
+ strategy="mock") which acts as a pass through
+ for arguments.
+
- [feature] Added pool_reset_on_return argument
to create_engine, allows control over
"connection return" behavior. Also added
diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index e3a6c5026..4d5a4b342 100644
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -227,6 +227,9 @@ class MockEngineStrategy(EngineStrategy):
def contextual_connect(self, **kwargs):
return self
+ def execution_options(self, **kw):
+ return self
+
def compiler(self, statement, parameters, **kwargs):
return self._dialect.compiler(
statement, parameters, engine=self, **kwargs)