From f784ac6dbae7b8fe07e9d898527a7a27dba2b3e4 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 31 May 2011 18:29:16 -0400 Subject: [PATCH] express the check for 'filter' in terms of _MapperEntity being present or not. move away slightly from the _mapper_entities collection. --- lib/sqlalchemy/orm/query.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 54e864abb1..98f9885a36 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1866,7 +1866,13 @@ class Query(object): context.runid = _new_runid() - filtered = bool(list(self._mapper_entities)) + for ent in self._entities: + if isinstance(ent, _MapperEntity): + filtered = True + break + else: + filtered = False + single_entity = filtered and len(self._entities) == 1 if filtered: -- 2.39.5