summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2010-10-14 12:04:51 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2010-10-14 12:04:51 -0400
commitb47983f8ecdc022c42d2c3b624894e58b4f18538 (patch)
tree4add4bf8f833236be42ec58b02c984ffaa579961 /lib/sqlalchemy/orm
parenta376f3e2daec1950b42822e94a8357848beaa18a (diff)
downloadsqlalchemy-b47983f8ecdc022c42d2c3b624894e58b4f18538.tar.gz
- Fixed labeling bug in Query whereby the NamedTuple
would mis-apply labels if any of the column expressions were un-labeled.
Diffstat (limited to 'lib/sqlalchemy/orm')
-rw-r--r--lib/sqlalchemy/orm/query.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 605f391aa..17603e04a 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1721,10 +1721,8 @@ class Query(object):
query_entity.row_processor(self, context, custom_rows)
for query_entity in self._entities
])
-
- if not single_entity:
- labels = [l for l in labels if l]
-
+
+
while True:
context.progress = {}
context.partials = {}