summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/compiler.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
-rw-r--r--lib/sqlalchemy/sql/compiler.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index eacbe59e1..2982a1759 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -477,7 +477,8 @@ class DefaultCompiler(engine.Compiled):
if asfrom or (prev_entry and 'select' in prev_entry):
stack_entry['is_subquery'] = True
- if prev_entry and 'iswrapper' in prev_entry:
+ stack_entry['iswrapper'] = iswrapper
+ if not iswrapper and prev_entry and 'iswrapper' in prev_entry:
column_clause_args = {'result_map':self.result_map}
else:
column_clause_args = {}