Changeset 8185 for django/trunk/tests/regressiontests/one_to_one_regress/models.py

Timestamp:

08/01/08 18:16:59 (4 months ago)

Author:

gwilson

Message:

Fixed #8070 -- Cache related objects passed to Model init as keyword arguments. Also:

• Model init no longer performs a database query to refetch the related objects it is passed.
  
• Model init now caches unsaved related objects correctly, too. (Previously, accessing the field would raise DoesNotExist error for null=False fields.)
  
• Added tests for assigning None to null=True ForeignKey fields (refs #6886).
  

Files:

• django/trunk/tests/regressiontests/one_to_one_regress/models.py (modified) (5 diffs)

django/trunk/tests/regressiontests/one_to_one_regress/models.py

@@ -23 +23 @@
-        return u"%s the bar" % self.place.name
-
+class UndergroundBar(models.Model):
+    place = models.OneToOneField(Place, null=True)
+    serves_cocktails = models.BooleanField()
+
-class Favorites(models.Model):
-    name = models.CharField(max_length = 50)
@@ -43 +47 @@
-[<Restaurant: Demon Dogs the restaurant>]
-
- 
+
-# reverse object is correct.
->>> b = Bar(place=p1, serves_cocktails=False)
@@ -54 +58 @@
-#
-# Regression test for #6886 (the related-object cache)
- 
+
-
-# Look up the objects again so that we get "fresh" objects
@@ -77 +81 @@
-True
-
+# Assigning None succeeds if field is null=True.
+>>> ug_bar = UndergroundBar.objects.create(place=p, serves_cocktails=False)
+>>> ug_bar.place = None
+>>> ug_bar.place is None
+True
+
-# Assigning None fails: Place.restaurant is null=False
->>> p.restaurant = None
@@ -89 +99 @@
-ValueError: Cannot assign "<Place: Demon Dogs the place>": "Place.restaurant" must be a "Restaurant" instance.
-
+# Creation using keyword argument should cache the related object.
+>>> p = Place.objects.get(name="Demon Dogs")
+>>> r = Restaurant(place=p)
+>>> r.place is p
+True
+
+# Creation using keyword argument and unsaved related instance (#8070).
+>>> p = Place()
+>>> r = Restaurant(place=p)
+>>> r.place is p
+True
+
+# Creation using attname keyword argument and an id will cause the related
+# object to be fetched.
+>>> p = Place.objects.get(name="Demon Dogs")
+>>> r = Restaurant(place_id=p.id)
+>>> r.place is p
+False
+>>> r.place == p
+True
+
-"""}