test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #29810 -- Fixed crash of select_related() on FilteredRelation with empty result.

This commit is contained in:
can 2019-04-23 13:56:05 +03:00 committed by Mariusz Felisiak
parent 6fd9c9daa6
commit c00b4dbda2
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/sql/compiler.py
View File

@ -892,7 +892,9 @@ class SQLCompiler:
from_parent = issubclass(model, opts.model) and model is not opts.model from_parent = issubclass(model, opts.model) and model is not opts.model
def local_setter(obj, from_obj): def local_setter(obj, from_obj):
f.remote_field.set_cached_value(from_obj, obj) # Set a reverse fk object when relation is non-empty.
if from_obj:
f.remote_field.set_cached_value(from_obj, obj)
def remote_setter(obj, from_obj): def remote_setter(obj, from_obj):
setattr(from_obj, name, obj) setattr(from_obj, name, obj)

6
tests/filtered_relation/tests.py
View File

@ -50,6 +50,12 @@ class FilteredRelationTests(TestCase):
(self.author2, self.book3, self.editor_b, self.author2), (self.author2, self.book3, self.editor_b, self.author2),
], lambda x: (x, x.book_join, x.book_join.editor, x.book_join.author)) ], lambda x: (x, x.book_join, x.book_join.editor, x.book_join.author))
def test_select_related_with_empty_relation(self):
qs = Author.objects.annotate(
book_join=FilteredRelation('book', condition=Q(pk=-1)),
).select_related('book_join').order_by('pk')
self.assertSequenceEqual(qs, [self.author1, self.author2])
def test_select_related_foreign_key(self): def test_select_related_foreign_key(self):
qs = Book.objects.annotate( qs = Book.objects.annotate(
author_join=FilteredRelation('author'), author_join=FilteredRelation('author'),