Merge "Ensure of_type subclass taken into account with wildcards"

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
index 19c81860e..ee3b83caa 100644
--- a/lib/sqlalchemy/orm/strategy_options.py
+++ b/lib/sqlalchemy/orm/strategy_options.py
@@ -203,6 +203,13 @@ class Load(Generative, MapperOption):
                     self.propagate_to_loaders = False
                 if wildcard_key:
                     attr = "%s:%s" % (wildcard_key, attr)
+
+                # TODO: AliasedInsp inside the path for of_type is not
+                # working for a with_polymorphic entity because the
+                # relationship loaders don't render the with_poly into the
+                # path.  See #4469 which will try to improve this
+                if existing_of_type and not existing_of_type.is_aliased_class:
+                    path = path.parent[existing_of_type]
                 path = path.token(attr)
                 self.path = path
                 return path
@@ -706,7 +713,6 @@ class _UnboundLoad(Load):
 
         if not loader.is_class_strategy:
             for idx, token in enumerate(start_path):
-
                 if not loader._generate_path(
                     loader.path,
                     token,