summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/strategies.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-04-16 22:35:53 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-04-16 22:35:53 +0000
commit86fef1e4593a6c25e83b2aca7577c62bec9fa2a9 (patch)
treecad15013e8beb0bdb8fa2b870adc1c3bac3ac6e9 /lib/sqlalchemy/engine/strategies.py
parent07cd648f3f34e0dac42304e16e2ecb7d992a2859 (diff)
downloadsqlalchemy-86fef1e4593a6c25e83b2aca7577c62bec9fa2a9.tar.gz
- removed meaningless entity_name argument from session.delete()
- session.merge() propigates given entity_name to locate that mapper if the given object is transient (and therefore has no entity_name) - some fixes to MockEngine which still is mostly useless for most cases. - unitofwork test used incorrect session.delete() signature
Diffstat (limited to 'lib/sqlalchemy/engine/strategies.py')
-rw-r--r--lib/sqlalchemy/engine/strategies.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index 1b760fca8..ba9b0968a 100644
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -180,9 +180,12 @@ class MockEngineStrategy(EngineStrategy):
engine = property(lambda s: s)
dialect = property(lambda s:s._dialect)
- def contextual_connect(self):
+ def contextual_connect(self, **kwargs):
return self
+ def compiler(self, statement, parameters, **kwargs):
+ return self._dialect.compiler(statement, parameters, engine=self, **kwargs)
+
def create(self, entity, **kwargs):
kwargs['checkfirst'] = False
entity.accept_visitor(self.dialect.schemagenerator(self, **kwargs))