summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/orm/properties.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index e0bf2e6e8..734b962a4 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -309,7 +309,10 @@ class PropertyLoader(StrategizedProperty):
def compare(self, op, value, value_is_parent=False):
if op == operators.eq:
if value is None:
- return ~sql.exists([1], self.prop.mapper.mapped_table, self.prop.primaryjoin)
+ if self.uselist:
+ return ~sql.exists([1], self.primaryjoin)
+ else:
+ return self._optimized_compare(None, value_is_parent=value_is_parent)
else:
return self._optimized_compare(value, value_is_parent=value_is_parent)
else: