Fix query_entities with labeled subqueries

2014-03-20 11:15:18 +02:00
parent d47d56525f
commit d615225c43
1 changed files with 10 additions and 5 deletions
--- a/sqlalchemy_utils/functions/orm.py
+++ b/sqlalchemy_utils/functions/orm.py
@@ -132,15 +132,20 @@ def query_entities(query):
    Example::


-        query = session.query(
-            Category
-        )
+        query = session.query(Category)
+
+        query_entities(query)  # <Category>
+
+
+        query = session.query(Category.id)
+
+        query_entities(query)  # <Category>

-        query_entities(query)  # ('Category', )

    :param query: SQLAlchemy Query object
    """
    for entity in query._entities:
+        if entity.entity_zero:
            yield entity.entity_zero.class_

    for entity in query._join_entities: