Skip to content
Browse files

[1.6.x] Minor change to get_extra_descriptor_filter()

Refs #20611. Backpatch of 6b4967e.
  • Loading branch information...
1 parent 92f66a6 commit 43f1d51b4ba3ab2c0223928904e1d24c0571da8d @akaariai akaariai committed
Showing with 11 additions and 5 deletions.
  1. +11 −5 django/db/models/fields/
16 django/db/models/fields/
@@ -297,10 +297,15 @@ def __get__(self, instance, instance_type=None):
params = dict(
(rh_field.attname, getattr(instance, lh_field.attname))
for lh_field, rh_field in self.field.related_fields)
- params.update(self.field.get_extra_descriptor_filter(instance))
qs = self.get_queryset(instance=instance)
+ extra_filter = self.field.get_extra_descriptor_filter(instance)
+ if isinstance(extra_filter, dict):
+ params.update(extra_filter)
+ qs = qs.filter(**params)
+ else:
+ qs = qs.filter(extra_filter, **params)
# Assuming the database enforces foreign keys, this won't fail.
- rel_obj = qs.get(**params)
+ rel_obj = qs.get()
if not self.field.rel.multiple:
setattr(rel_obj, self.field.related.get_cache_name(), instance)
setattr(instance, self.cache_name, rel_obj)
@@ -1003,10 +1008,11 @@ def get_extra_descriptor_filter(self, instance):
user does 'instance.fieldname', that is the extra filter is used in
the descriptor of the field.
- The filter should be something usable in .filter(**kwargs) call, and
- will be ANDed together with the joining columns condition.
+ The filter should be either a dict usable in .filter(**kwargs) call or
+ a Q-object. The condition will be ANDed together with the relation's
+ joining columns.
- A parallel method is get_extra_relation_restriction() which is used in
+ A parallel method is get_extra_restriction() which is used in
JOIN and subquery conditions.
return {}

0 comments on commit 43f1d51

Please sign in to comment.
Something went wrong with that request. Please try again.