summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
authorcan <cansarigol@derinbilgi.com.tr>2019-04-23 13:56:05 +0300
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-04-23 13:48:33 +0200
commitc00b4dbda2d9217cac205c4ffb3ccc1fa59a28ae (patch)
tree4adc842e5e28553247453900fb82aba17b2661f0 /django/db/models/sql
parent6fd9c9daa61b7103ccb03a7618483e4d580bfe25 (diff)
Fixed #29810 -- Fixed crash of select_related() on FilteredRelation with empty result.
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/compiler.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 3d133cb672..7649c39262 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -892,7 +892,9 @@ class SQLCompiler:
from_parent = issubclass(model, opts.model) and model is not opts.model
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):
setattr(from_obj, name, obj)