summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/context.py
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2021-07-09 21:29:40 +0000
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>2021-07-09 21:29:40 +0000
commitca52e87268fec966f6005b1e4aa30206ae895e9e (patch)
tree179bd2b61fbb50c114e0617e06913b8c5917357b /lib/sqlalchemy/orm/context.py
parenta457e555e0b1cc8aca79270f2330b5fdef78eafb (diff)
parent4e1b2ee4cb345f499bdfbff6c393efbebd8e1e72 (diff)
downloadsqlalchemy-ca52e87268fec966f6005b1e4aa30206ae895e9e.tar.gz
Merge "Add additional support to honor _proxy_key in Core selects"
Diffstat (limited to 'lib/sqlalchemy/orm/context.py')
-rw-r--r--lib/sqlalchemy/orm/context.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/context.py b/lib/sqlalchemy/orm/context.py
index 26e35b66e..0af3fd6af 100644
--- a/lib/sqlalchemy/orm/context.py
+++ b/lib/sqlalchemy/orm/context.py
@@ -2890,7 +2890,7 @@ class _ORMColumnEntity(_ColumnEntity):
ezero._adapter if ezero.is_aliased_class else None,
)
- if column._annotations:
+ if column._annotations and not column._expression_label:
# annotated columns perform more slowly in compiler and
# result due to the __eq__() method, so use deannotated
column = column._deannotate()