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.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index d3a4a64a2..cc41e6182 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -1068,6 +1068,7 @@ class SQLCompiler(engine.Compiled):
def visit_select(self, select, asfrom=False, parens=True,
iswrapper=False, fromhints=None,
compound_index=0,
+ force_result_map=False,
positional_names=None, **kwargs):
entry = self.stack and self.stack[-1] or {}
@@ -1082,9 +1083,11 @@ class SQLCompiler(engine.Compiled):
# to outermost if existingfroms: correlate_froms =
# correlate_froms.union(existingfroms)
- populate_result_map = compound_index == 0 and (
- not entry or \
- entry.get('iswrapper', False)
+ populate_result_map = force_result_map or (
+ compound_index == 0 and (
+ not entry or \
+ entry.get('iswrapper', False)
+ )
)
self.stack.append({'from': correlate_froms,