diff options
| author | Sergey Fedoseev <fedoseev.sergey@gmail.com> | 2017-08-15 18:48:07 +0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-08-15 09:48:07 -0400 |
| commit | 8a99a7d2d5c3da6301bb41bf0fa8336736637cdb (patch) | |
| tree | 7e4d9e7806b12b112b0a9de08ebcd798efa52cc3 /django/db | |
| parent | 6542999c541b9baa6b2a1baf3a8d4940f2a6f832 (diff) | |
Simplified RelatedPopulator.populate().
Diffstat (limited to 'django/db')
| -rw-r--r-- | django/db/models/query.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index f6fe830ace..0f55268b18 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -1704,12 +1704,12 @@ class RelatedPopulator: obj = None else: obj = self.model_cls.from_db(self.db, self.init_list, obj_data) - if obj and self.related_populators: - for rel_iter in self.related_populators: - rel_iter.populate(row, obj) + if self.related_populators: + for rel_iter in self.related_populators: + rel_iter.populate(row, obj) + if self.remote_field: + self.remote_field.set_cached_value(obj, from_obj) self.field.set_cached_value(from_obj, obj) - if obj and self.remote_field: - self.remote_field.set_cached_value(obj, from_obj) def get_related_populators(klass_info, select, db): |