summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/base.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2022-11-14 13:18:45 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2022-11-14 13:43:02 -0500
commitbf6adda95461d4c3c2076d39850df2403a157662 (patch)
treedc4f6249aa96b85dfb6bcb9626c75b27bbd98dc1 /lib/sqlalchemy/sql/base.py
parent3d892381996e7ba68ee3bf6d7de40c8414e3812a (diff)
downloadsqlalchemy-bf6adda95461d4c3c2076d39850df2403a157662.tar.gz
avoid putting annotated columns in sets
backporting a small bit of the changes made for the 2.0 version of #8796. See if the changes apply cleanly to the 1.4 branch. Fixes: #8796 Change-Id: I8118511a10beb38c545a55c962a18a77611293af
Diffstat (limited to 'lib/sqlalchemy/sql/base.py')
-rw-r--r--lib/sqlalchemy/sql/base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py
index ec685d1fa..4519e649b 100644
--- a/lib/sqlalchemy/sql/base.py
+++ b/lib/sqlalchemy/sql/base.py
@@ -1430,7 +1430,7 @@ class ColumnCollection(object):
operator.add,
[
sc._annotations.get("weight", 1)
- for sc in col._uncached_proxy_set()
+ for sc in col._uncached_proxy_list()
if sc.shares_lineage(column)
],
)
@@ -1438,7 +1438,7 @@ class ColumnCollection(object):
operator.add,
[
sc._annotations.get("weight", 1)
- for sc in c._uncached_proxy_set()
+ for sc in c._uncached_proxy_list()
if sc.shares_lineage(column)
],
)