diff options
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 54e864abb..98f9885a3 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: |