Merge "Adapt single inh criteria more specifically"

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 56ad965de..a394ec06e 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -2103,7 +2103,7 @@ class Mapper(InspectionAttr):
     @_memoized_configured_property
     def _single_table_criterion(self):
         if self.single and self.inherits and self.polymorphic_on is not None:
-            return self.polymorphic_on.in_(
+            return self.polymorphic_on._annotate({"parentmapper": self}).in_(
                 m.polymorphic_identity for m in self.self_and_descendants
             )
         else:
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 7ddcf10b0..2bd79a2cd 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -364,7 +364,6 @@ class Query(object):
                     or "_orm_adapt" in elem._annotations
                     or "parententity" in elem._annotations
                 ):
-
                     e = adapter(elem)
                     if e is not None:
                         return e
@@ -3933,6 +3932,7 @@ class Query(object):
             if single_crit is not None:
                 if adapter:
                     single_crit = adapter.traverse(single_crit)
+
                 single_crit = self._adapt_clause(single_crit, False, False)
                 context.whereclause = sql.and_(
                     sql.True_._ifnone(context.whereclause), single_crit