diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/attributes.py | 1 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/context.py | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index b8974196c..2f8c8f940 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -483,6 +483,7 @@ class InstrumentedAttribute(Mapped): HasEntityNamespace = util.namedtuple( "HasEntityNamespace", ["entity_namespace"] ) +HasEntityNamespace.is_mapper = HasEntityNamespace.is_aliased_class = False def create_proxied_attribute(descriptor): diff --git a/lib/sqlalchemy/orm/context.py b/lib/sqlalchemy/orm/context.py index 55b61b19e..aeba9ed80 100644 --- a/lib/sqlalchemy/orm/context.py +++ b/lib/sqlalchemy/orm/context.py @@ -802,12 +802,13 @@ class ORMSelectCompileState(ORMCompileState, SelectState): element.is_selectable and "entity_namespace" in element._annotations ): - for elem in _select_iterables( - element._annotations[ - "entity_namespace" - ]._all_column_expressions - ): - yield elem + ens = element._annotations["entity_namespace"] + if not ens.is_mapper and not ens.is_aliased_class: + for elem in _select_iterables([element]): + yield elem + else: + for elem in _select_iterables(ens._all_column_expressions): + yield elem else: for elem in _select_iterables([element]): yield elem |