summaryrefslogtreecommitdiff
path: root/django/db/models
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models')
-rw-r--r--django/db/models/base.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py
index bf9854d289..bd638e2499 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -583,6 +583,15 @@ class Model(six.with_metaclass(ModelBase, object)):
if field:
setattr(self, field.attname, self._get_pk_val(parent._meta))
+ # Since we didn't have an instance of the parent handy, we
+ # set attname directly, bypassing the descriptor.
+ # Invalidate the related object cache, in case it's been
+ # accidentally populated. A fresh instance will be
+ # re-built from the database if necessary.
+ cache_name = field.get_cache_name()
+ if hasattr(self, cache_name):
+ delattr(self, cache_name)
+
if meta.proxy:
return