summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext/associationproxy.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2018-01-02 17:56:45 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2018-01-02 18:00:11 -0500
commitdcf66590d2d4dda35cdb2db25755de4fb1cd84a5 (patch)
tree3b02d2153813ec4705a25fc81e1a19d6652be5eb /lib/sqlalchemy/ext/associationproxy.py
parent435aaff20effbc914bbb4d19f177df3c1f5f15ab (diff)
downloadsqlalchemy-dcf66590d2d4dda35cdb2db25755de4fb1cd84a5.tar.gz
Check for the endmost target when chaining contains()
Fixed regression in association proxy due to :ticket:`3769` (allow for chained any() / has()) where contains() against an association proxy chained in the form (o2m relationship, associationproxy(m2o relationship, m2o relationship)) would raise an error regarding the re-application of contains() on the final link of the chain. Change-Id: Iea51ce84c2c5a332416fff10b1ba0e676cf0bad7 Fixes: #4150
Diffstat (limited to 'lib/sqlalchemy/ext/associationproxy.py')
-rw-r--r--lib/sqlalchemy/ext/associationproxy.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py
index c0dbb538e..d6e9a43cc 100644
--- a/lib/sqlalchemy/ext/associationproxy.py
+++ b/lib/sqlalchemy/ext/associationproxy.py
@@ -462,6 +462,7 @@ class AssociationProxy(interfaces.InspectionAttrInfo):
if target_assoc is not None:
return self._comparator._criterion_exists(
target_assoc.contains(obj)
+ if not target_assoc.scalar else target_assoc == obj
)
elif self._target_is_object and self.scalar and \
not self._value_is_scalar: