- [bug] Added execution_options() call to

    MockConnection (i.e., that used with
    strategy="mock") which acts as a pass through
    for arguments.

diff --git a/CHANGES b/CHANGES
index a25c5f45a918529baf767abac34f57da84ea9135..438e8520b674a8963f22b5660c1b48982f526a34 100644 (file)
--- 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 e3a6c50265b110710c567f56bc6d1926cef84382..4d5a4b3428067f3c623135cc754aa3643f07a97b 100644 (file)
--- 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)