Commit 7475092c authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

[1.0.X] Fixed #10157: correctly set the related objects pk when assigning a... 

[1.0.X] Fixed #10157: correctly set the related objects pk when assigning a reverse OneToOne. Thanks, dgouldin.

Backport of r10224 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent fd0c4bb7

django/db/models/fields/related.py

+2 −2
Original line number Diff line number Diff line
@@ -203,8 +203,8 @@ class SingleRelatedObjectDescriptor(object): 
                                (value, instance._meta.object_name,

                                 self.related.get_accessor_name(), self.related.opts.object_name))



        # Set the value of the related field

        setattr(value, self.related.field.rel.get_related_field().attname, instance)

        # Set the value of the related field to the value of the related object's related field

        setattr(value, self.related.field.attname, getattr(instance, self.related.field.rel.get_related_field().attname))



        # Since we already know what the related object is, seed the related

        # object caches now, too. This avoids another db hit if you get the

tests/modeltests/one_to_one/models.py

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ DoesNotExist: Restaurant matching query does not exist. 
<Restaurant: Ace Hardware the restaurant>

>>> r.place

<Place: Ace Hardware the place>

>>> p2.id

2



# Set the place back again, using assignment in the reverse direction.

>>> p1.restaurant = r