summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/default.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-03-08 11:29:10 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-03-08 11:34:14 -0400
commit9854114f578833aee49b65e440319a0ec26daab6 (patch)
treeb0e6c9561f388e92480f04a2229513db6363096c /lib/sqlalchemy/engine/default.py
parent17b2fd3fba8eef5bdd4040f2d71c75e4aeb4e215 (diff)
downloadsqlalchemy-9854114f578833aee49b65e440319a0ec26daab6.tar.gz
foo
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
-rw-r--r--lib/sqlalchemy/engine/default.py15
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 62469d720..bdd9d2715 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -463,7 +463,7 @@ class DefaultExecutionContext(interfaces.ExecutionContext):
executemany = False
compiled = None
statement = None
- _result_columns = None
+ result_column_struct = None
_is_implicit_returning = False
_is_explicit_returning = False
@@ -522,10 +522,8 @@ class DefaultExecutionContext(interfaces.ExecutionContext):
self.execution_options = compiled.statement._execution_options.union(
connection._execution_options)
- # compiled clauseelement. process bind params, process table defaults,
- # track collections used by ResultProxy to target and process results
-
- self._result_columns = compiled._result_columns
+ self.result_column_struct = (
+ compiled._result_columns, compiled._ordered_columns)
self.unicode_statement = util.text_type(compiled)
if not dialect.supports_unicode_statements:
@@ -664,13 +662,6 @@ class DefaultExecutionContext(interfaces.ExecutionContext):
return self
@util.memoized_property
- def result_map(self):
- if self._result_columns:
- return self.compiled.result_map
- else:
- return None
-
- @util.memoized_property
def engine(self):
return self.root_connection.engine