summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/interfaces.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2021-05-29 10:05:20 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2021-05-29 10:10:14 -0400
commit9727cdecbe52b86b4328b92d7e10a7193ca8083e (patch)
tree51cf0647c398720e3e0eb46869b71b463bb36fb7 /lib/sqlalchemy/orm/interfaces.py
parent3edc30fce3717b48407f37de958f5b6e6d0bc549 (diff)
downloadsqlalchemy-9727cdecbe52b86b4328b92d7e10a7193ca8083e.tar.gz
Ensure propagate_attrs available on PropComparator
Fixed regression caused by just-released performance fix mentioned in #6550 where a query.join() to a relationship could produce an AttributeError if the query were made against non-ORM structures only, a fairly unusual calling pattern. In this fix, since we are no longer going through the production of ``__clause_element__()`` for Cls.some_relationship, I assumed we just throw this object away completely but I missed the one little bit where we might be getting ``_propagate_attrs`` from it. So we implement ``_propagate_attrs`` on ``PropComparator`` as well, since this is easy to define. Fixes: #6558 Change-Id: If781bf844e7e3d3b0841aff1c3668e9d6af9f097
Diffstat (limited to 'lib/sqlalchemy/orm/interfaces.py')
-rw-r--r--lib/sqlalchemy/orm/interfaces.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py
index ed38becf7..c9a601f99 100644
--- a/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@ -426,6 +426,18 @@ class PropComparator(operators.ColumnOperators):
return inspect(self._parententity).mapper
@property
+ def _propagate_attrs(self):
+ # this suits the case in coercions where we don't actually
+ # call ``__clause_element__()`` but still need to get
+ # resolved._propagate_attrs. See #6558.
+ return util.immutabledict(
+ {
+ "compile_state_plugin": "orm",
+ "plugin_subject": self._parentmapper,
+ }
+ )
+
+ @property
def adapter(self):
"""Produce a callable that adapts column expressions
to suit an aliased version of this comparator.