summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorHasan Ramezani <hasan.r67@gmail.com>2019-10-10 21:13:21 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-10-11 08:10:48 +0200
commit6a75cea76a98c08bf2e20d787be9b14c2cd94860 (patch)
tree91c8d04ed510c2c0c75a0f2e5396882760d95891 /django
parente1ae2b00504ba30481285b2bd767d1ad561bf4be (diff)
Fixed #30854 -- Fixed QuerySet.select_related() with multiple FilteredRelations.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/sql/compiler.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index f475b82921..9493d0dc3c 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -1,5 +1,6 @@
import collections
import re
+from functools import partial
from itertools import chain
from django.core.exceptions import EmptyResultSet, FieldError
@@ -896,6 +897,9 @@ class SQLCompiler:
if from_obj:
f.remote_field.set_cached_value(from_obj, obj)
+ def remote_setter(name, obj, from_obj):
+ setattr(from_obj, name, obj)
+
for name in list(requested):
# Filtered relations work only on the topmost level.
if cur_depth > 1:
@@ -906,15 +910,12 @@ class SQLCompiler:
model = join_opts.model
alias = joins[-1]
from_parent = issubclass(model, opts.model) and model is not opts.model
-
- def remote_setter(obj, from_obj):
- setattr(from_obj, name, obj)
klass_info = {
'model': model,
'field': f,
'reverse': True,
'local_setter': local_setter,
- 'remote_setter': remote_setter,
+ 'remote_setter': partial(remote_setter, name),
'from_parent': from_parent,
}
related_klass_infos.append(klass_info)