From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 31 May 2011 22:29:16 +0000 (-0400)
Subject: express the check for 'filter' in terms of _MapperEntity being present or not.
X-Git-Tag: rel_0_7_1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f784ac6dbae7b8fe07e9d898527a7a27dba2b3e4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

express the check for 'filter' in terms of _MapperEntity being present or not.
move away slightly from the _mapper_entities collection.
---

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: