From d615225c436eabd5cc2d75b1bd6ff238e670e947 Mon Sep 17 00:00:00 2001 From: Konsta Vesterinen Date: Thu, 20 Mar 2014 11:15:18 +0200 Subject: [PATCH] Fix query_entities with labeled subqueries --- sqlalchemy_utils/functions/orm.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sqlalchemy_utils/functions/orm.py b/sqlalchemy_utils/functions/orm.py index b35d7e2..2135fb3 100644 --- a/sqlalchemy_utils/functions/orm.py +++ b/sqlalchemy_utils/functions/orm.py @@ -132,16 +132,21 @@ def query_entities(query): Example:: - query = session.query( - Category - ) + query = session.query(Category) + + query_entities(query) # + + + query = session.query(Category.id) + + query_entities(query) # - query_entities(query) # ('Category', ) :param query: SQLAlchemy Query object """ for entity in query._entities: - yield entity.entity_zero.class_ + if entity.entity_zero: + yield entity.entity_zero.class_ for entity in query._join_entities: if isinstance(entity, Mapper):