Ticket #9023: onetoone_cache_clear.diff

fields/related.py

@@ -114 +114 @@
         self.set_attributes_from_rel()
         related = RelatedObject(other, cls, self)
         if not cls._meta.abstract:
-            self.contribute_to_related_class(other, related)
+            self.related_object_descriptor = self.contribute_to_related_class(other, related)
 
     def get_db_prep_lookup(self, lookup_type, value):
         # If we are doing a lookup on a Related Field, we must be
@@ -271 +271 @@
                                 (value, instance._meta.object_name,
                                  self.field.name, self.field.rel.to._meta.object_name))
 
+        # Remove the cache for the related field in the related object
+        related_object = getattr(instance, self.field.name)
+        if related_object:
+            cache_name = self.field.related_object_descriptor.cache_name
+            if hasattr(related_object, cache_name):
+                delattr(related_object, cache_name)
+
         # Set the value of the related field
         try:
             val = getattr(value, self.field.rel.get_related_field().attname)
@@ -719 +726 @@
         cls._meta.duplicate_targets[self.column] = (target, "o2m")
 
     def contribute_to_related_class(self, cls, related):
-        setattr(cls, related.get_accessor_name(), ForeignRelatedObjectsDescriptor(related))
+        descriptor = ForeignRelatedObjectsDescriptor(related)
+        setattr(cls, related.get_accessor_name(), descriptor)
+        return descriptor
 
     def formfield(self, **kwargs):
         defaults = {
@@ -758 +767 @@
         super(OneToOneField, self).__init__(to, to_field, OneToOneRel, **kwargs)
 
     def contribute_to_related_class(self, cls, related):
-        setattr(cls, related.get_accessor_name(),
-                SingleRelatedObjectDescriptor(related))
+        descriptor = SingleRelatedObjectDescriptor(related)
+        setattr(cls, related.get_accessor_name(), descriptor)
+        return descriptor
 
     def formfield(self, **kwargs):
         if self.rel.parent_link: