Merge "Adapt right side in join if lateral detected"

1 files changed, 7 insertions, 0 deletions

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):