From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 14 Feb 2012 01:21:18 +0000 (-0500)
Subject:   - [bug] Added execution_options() call to
X-Git-Tag: rel_0_7_6~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=472fcea10aaf264c2980733b33e25c76c2a927cb;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

  - [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 a25c5f45a9..438e8520b6 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 e3a6c50265..4d5a4b3428 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)