From 7ed6aee2750d6ceaadc429087e2314962808180a Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 30 Jun 2021 16:04:07 -0400
Subject: clear new Query._memoized_select_entities in _from_selectable

Fixed regression caused in 1.4.19 due to #6503 and related involving
:meth:`_orm.Query.with_entities` where the new structure used would be
inappropriately transferred to an enclosing :class:`_orm.Query` when making
use of set operations such as :meth:`_orm.Query.union`, causing the JOIN
instructions within to be applied to the outside query as well.

Fixes: #6698
Change-Id: Ia9f294215ebc01330d142a0a3e5be9d02be9380f
---
 lib/sqlalchemy/orm/query.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index d8f4b4ea7..a89b86c79 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1359,6 +1359,7 @@ class Query(
             "_offset_clause",
             "_last_joined_entity",
             "_legacy_setup_joins",
+            "_memoized_select_entities",
             "_distinct",
             "_distinct_on",
             "_having_criteria",
-- 
cgit v1.2.1