Merge "Ensure entity or None returned from _entity_from_pre_ent_zero()"

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index bbad6b05a..6a8a2c571 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -22,6 +22,7 @@ import itertools
 import operator
 import types
 
+from sqlalchemy.sql import visitors
 from . import exc as orm_exc
 from . import interfaces
 from . import loading
@@ -200,7 +201,12 @@ class Query(
         elif "bundle" in ent._annotations:
             return ent._annotations["bundle"]
         else:
-            return ent
+            # label, other SQL expression
+            for element in visitors.iterate(ent):
+                if "parententity" in element._annotations:
+                    return element._annotations["parententity"]
+            else:
+                return None
 
     def _only_full_mapper_zero(self, methname):
         if (