Changeset 8185

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/django/db/models/base.py (modified) (2 diffs)
• django/trunk/tests/modeltests/many_to_one/models.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/many_to_one_regress/models.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/one_to_one_regress/models.py (modified) (5 diffs)

django/trunk/django/db/models/base.py

@@ -201 +201 @@
-
-        for field in fields_iter:
+            rel_obj = None
-            if kwargs:
-                if isinstance(field.rel, ManyToOneRel):
@@ -217 +218 @@
-                        if rel_obj is None and field.null:
-                            val = None
-                        else:
-                            try:
-                                val = getattr(rel_obj, field.rel.get_related_field().attname)
-                            except AttributeError:
-                                raise TypeError("Invalid value: %r should be a %s instance, not a %s" %
-                                    (field.name, field.rel.to, type(rel_obj)))
-                else:
-                    val = kwargs.pop(field.attname, field.get_default())
-            else:
-                val = field.get_default()
-
+
+
+
+
+
+
+
+
-
-        if kwargs:

django/trunk/tests/modeltests/many_to_one/models.py

@@ -47 +47 @@
-# Article objects have access to their related Reporter objects.
->>> r = a.reporter
+
+# These are strings instead of unicode strings because that's what was used in
+# the creation of this reporter (and we haven't refreshed the data from the
+# database, which always returns unicode strings).
->>> r.first_name, r.last_name
-u'John', u
+'John', 
-
-# Create an Article via the Reporter object.
@@ -177 +181 @@
-
-# You can also use a queryset instead of a literal list of instances.
- 
+
-# then converted into a query
->>> Article.objects.filter(reporter__in=Reporter.objects.filter(first_name='John').values('pk').query).distinct()

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

@@ -56 +56 @@
-
-#
-
+.
-#
->>> p = Parent.objects.create(name="Parent")
->>> c = Child.objects.create(name="Child", parent=p)
-
-
+.
->>> c = Child.objects.get(name="Child")
->>> p = c.parent
-
-
+.
->>> c.parent is p
-True
-
-
+.
->>> del c._parent_cache
->>> c.parent is p
-False
-
-
+.
->>> p2 = Parent.objects.create(name="Parent 2")
->>> c.parent = p2
@@ -80 +80 @@
-True
-
-
+
+
+
+
+
+
->>> c.parent = None
-Traceback (most recent call last):
@@ -92 +97 @@
-ValueError: Cannot assign "<First: First object>": "Child.parent" must be a "Parent" instance.
-
-
+
+
+
+
+
-
+# Creation using keyword argument and unsaved related instance (#8070).
+>>> p = Parent()
+>>> c = Child(parent=p)
+>>> c.parent is p
+True
+
+# Creation using attname keyword argument and an id will cause the related
+# object to be fetched.
+>>> p = Parent.objects.get(name="Parent")
+>>> c = Child(parent_id=p.id)
+>>> c.parent is p
+False
+>>> c.parent == p
+True
+
+
+#
+# Test of multiple ForeignKeys to the same model (bug #7125).
+#
->>> c1 = Category.objects.create(name='First')
->>> c2 = Category.objects.create(name='Second')

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
+
-"""}