summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2022-05-23 14:58:55 +0000
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>2022-05-23 14:58:55 +0000
commit3d00de4cca7a80650316754f338317824f921940 (patch)
treea5517628f8cf68c930612a4c6bb73ef391670c7f /lib/sqlalchemy/sql
parentc1480c65efb94139c79d7509d754492e79292c74 (diff)
parentfbdf8251924571add5478e9ee5a915316a7baa11 (diff)
downloadsqlalchemy-3d00de4cca7a80650316754f338317824f921940.tar.gz
Merge "render select froms first" into main
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/selectable.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index 733def377..53dcf51c7 100644
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -4502,6 +4502,7 @@ class SelectState(util.MemoizedSlots, CompileState):
return self._normalize_froms(
itertools.chain(
+ self.from_clauses,
itertools.chain.from_iterable(
[
element._from_objects
@@ -4514,7 +4515,6 @@ class SelectState(util.MemoizedSlots, CompileState):
for element in statement._where_criteria
]
),
- self.from_clauses,
),
check_statement=statement,
ambiguous_table_name_map=ambiguous_table_name_map,