From 43f2c66ea7413cc0aaf6ca040ad33fb65ca4412d Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 17 Sep 2018 11:38:52 -0400 Subject: Adapt right side in join if lateral detected Fixed bug where use of :class:`.Lateral` construct in conjunction with :meth:`.Query.join` as well as :meth:`.Query.select_entity_from` would not apply clause adaption to the right side of the join. "lateral" introduces the use case of the right side of a join being correlatable. Previously, adaptation of this clause wasn't considered. Fixes: #4334 Change-Id: I3631e562092769d30069a2aa5e50a580f4661a23 --- lib/sqlalchemy/orm/query.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/sqlalchemy/orm') diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 627a4e01c..7e7c93527 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -542,6 +542,7 @@ class Query(object): if with_labels: q = q.with_labels() q = q.statement + if reduce_columns: q = q.reduce_columns() return q.alias(name=name) @@ -2381,6 +2382,12 @@ class Query(object): need_adapter = False + if r_info.is_clause_element and right_selectable._is_lateral: + # orm_only is disabled to suit the case where we have to + # adapt an explicit correlate(Entity) - the select() loses + # the ORM-ness in this case right now, ideally it would not + right = self._adapt_clause(right, True, False) + if right_mapper and right is right_selectable: if not right_selectable.is_derived_from( right_mapper.mapped_table): -- cgit v1.2.1