removed unnecessary _branch calls

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index ef875a638c241a5d1a17781c6cafeee2e7a694c8..2605bce5724cb0d6e801d5de1e8b3027a5f6fe2a 100644 (file)
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -549,7 +549,6 @@ class Connection(Connectable):
         This is used to execute "sub" statements within a single execution,
         usually an INSERT statement.
         """
-
         return Connection(self.__engine, self.__connection, _branch=True)
 
     engine = property(lambda s:s.__engine, doc="The Engine with which this Connection is associated.")
@@ -1616,8 +1615,8 @@ class DefaultRunner(schema.SchemaVisitor):
 
     def __init__(self, context):
         self.context = context
-        self.connection = self.context._connection._branch()
-    dialect = property(lambda self:self.context.dialect)
+        self.connection = context._connection._branch()
+        self.dialect = context.dialect
 
     def get_column_default(self, column):
         if column.default is not None:

diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 50fac430bf89494c34cafaf1caf7897c476355a2..ca22dd2a7c15d1d92b3c61e97f8d1450647dc70e 100644 (file)
--- 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)