summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/default.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2007-08-20 22:06:31 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2007-08-20 22:06:31 +0000
commit2d91940d0fa1f9e74c87d2d966daf5969f30fb17 (patch)
tree21c35dd797fbdfcd0794865fd25c50e44d5843ef /lib/sqlalchemy/engine/default.py
parent109d5359617bf8c9a8acc6498935a22f9f6949ef (diff)
downloadsqlalchemy-2d91940d0fa1f9e74c87d2d966daf5969f30fb17.tar.gz
removed unnecessary _branch calls
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
-rw-r--r--lib/sqlalchemy/engine/default.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 50fac430b..ca22dd2a7 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -131,11 +131,14 @@ class DefaultExecutionContext(base.ExecutionContext):
self._connection = connection
self.compiled = compiled
self._postfetch_cols = util.Set()
+ self.engine = connection.engine
if compiled is not None:
self.typemap = compiled.typemap
self.column_labels = compiled.column_labels
self.statement = unicode(compiled)
+ self.isinsert = compiled.isinsert
+ self.isupdate = compiled.isupdate
if parameters is None:
self.compiled_parameters = compiled.construct_params({})
self.executemany = False
@@ -149,22 +152,21 @@ class DefaultExecutionContext(base.ExecutionContext):
self.executemany = False
else:
self.executemany = True
+
elif statement is not None:
self.typemap = self.column_labels = None
self.parameters = self.__encode_param_keys(parameters)
self.statement = statement
+ self.isinsert = self.isupdate = False
else:
self.statement = None
+ self.isinsert = self.isupdate = False
if self.statement is not None and not dialect.supports_unicode_statements:
self.statement = self.statement.encode(self.dialect.encoding)
self.cursor = self.create_cursor()
- engine = property(lambda s:s.connection.engine)
- isinsert = property(lambda s:s.compiled and s.compiled.isinsert)
- isupdate = property(lambda s:s.compiled and s.compiled.isupdate)
-
connection = property(lambda s:s._connection._branch())
root_connection = property(lambda s:s._connection)