summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/expression.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
-rw-r--r--lib/sqlalchemy/sql/expression.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index f37faa801..f9a3863da 100644
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -4802,6 +4802,15 @@ class Select(_SelectBase):
toremove = set(itertools.chain(*[f._hide_froms for f in froms]))
if toremove:
+ # if we're maintaining clones of froms,
+ # add the copies out to the toremove list
+ if self._from_cloned:
+ toremove.update(
+ self._from_cloned[f] for f in
+ toremove.intersection(self._from_cloned)
+ )
+ # filter out to FROM clauses not in the list,
+ # using a list to maintain ordering
froms = [f for f in froms if f not in toremove]
if len(froms) > 1 or self._correlate: