Changeset 7477 for django/trunk/tests/modeltests

Timestamp:

04/26/08 21:50:16 (9 months ago)

Author:

mtredinnick

Message:

Merged the queryset-refactor branch into trunk.

This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.

Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658

Files:

• django/trunk/tests/modeltests/basic/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/custom_columns/models.py (modified) (2 diffs)
• django/trunk/tests/modeltests/field_subclassing/models.py (modified) (3 diffs)
• django/trunk/tests/modeltests/lookup/models.py (modified) (3 diffs)
• django/trunk/tests/modeltests/many_to_many/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/many_to_one/models.py (modified) (4 diffs)
• django/trunk/tests/modeltests/many_to_one_null/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/model_inheritance/models.py (modified) (4 diffs)
• django/trunk/tests/modeltests/one_to_one/models.py (modified) (7 diffs)
• django/trunk/tests/modeltests/ordering/models.py (modified) (2 diffs)
• django/trunk/tests/modeltests/order_with_respect_to (added)
• django/trunk/tests/modeltests/order_with_respect_to/__init__.py (added)
• django/trunk/tests/modeltests/order_with_respect_to/models.py (added)
• django/trunk/tests/modeltests/or_lookups/models.py (modified) (3 diffs)
• django/trunk/tests/modeltests/reserved_names/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/reverse_lookup/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/select_related/models.py (modified) (6 diffs)
• django/trunk/tests/modeltests/serializers/models.py (modified) (9 diffs)
• django/trunk/tests/modeltests/signals/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/transactions/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/update (added)
• django/trunk/tests/modeltests/update/__init__.py (added)
• django/trunk/tests/modeltests/update/models.py (added)

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

@@ -293 +293 @@
-[<Article: Default headline>]
-
-
-
-
-
-
+
+
+
-
-# Also, once you have sliced you can't filter, re-order or combine

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

@@ -56 +56 @@
->>> art.authors = [a, a2]
-
-
-custom values, 
+custom values,
+
-
-# Query the available authors
@@ -72 +72 @@
-Traceback (most recent call last):
-    ...
-TypeError: Cannot resolve keyword 'firstname' into field. Choices are: article, id, first_name
+FieldError: Cannot resolve keyword 'firstname' into field. Choices are: article, first_name, id
-
->>> a = Author.objects.get(last_name__exact='Smith')

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

@@ -6 +6 @@
-from django.utils.encoding import force_unicode
-from django.core import serializers
+from django.core.exceptions import FieldError
-
-class Small(object):
@@ -51 +52 @@
-        if lookup_type == 'isnull':
-            return []
-Type
+Field
-
-    def flatten_data(self, follow, obj=None):
@@ -95 +96 @@
-Traceback (most recent call last):
-...
-Type
+Field
-
-# Serialization works, too.

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

@@ -163 +163 @@
-Traceback (most recent call last):
-    ...
-DoesNotExist: Article has no field named 'id_plus_two'
+Error: Cannot resolve keyword 'id_plus_two' into field. Choices are: headline, id, id_plus_one, pub_date
-
-# If you don't specify field names to values(), all are returned.
->>> list(Article.objects.filter(id=5).values()) == [{'id': 5, 'headline': 'Article 5', 'pub_date': datetime(2005, 8, 1, 9, 0)}]
-True
+
+# values_list() is similar to values(), except that the results are returned as
+# a list of tuples, rather than a list of dictionaries. Within each tuple, the
+# order of the elemnts is the same as the order of fields in the values_list()
+# call.
+>>> Article.objects.values_list('headline')
+[(u'Article 5',), (u'Article 6',), (u'Article 4',), (u'Article 2',), (u'Article 3',), (u'Article 7',), (u'Article 1',)]
+
+>>> Article.objects.values_list('id').order_by('id')
+[(1,), (2,), (3,), (4,), (5,), (6,), (7,)]
+>>> Article.objects.values_list('id', flat=True).order_by('id')
+[1, 2, 3, 4, 5, 6, 7]
+
+>>> Article.objects.extra(select={'id_plus_one': 'id+1'}).order_by('id').values_list('id')
+[(1,), (2,), (3,), (4,), (5,), (6,), (7,)]
+>>> Article.objects.extra(select={'id_plus_one': 'id+1'}).order_by('id').values_list('id_plus_one', 'id')
+[(2, 1), (3, 2), (4, 3), (5, 4), (6, 5), (7, 6), (8, 7)]
+>>> Article.objects.extra(select={'id_plus_one': 'id+1'}).order_by('id').values_list('id', 'id_plus_one')
+[(1, 2), (2, 3), (3, 4), (4, 5), (5, 6), (6, 7), (7, 8)]
+
+>>> Article.objects.values_list('id', 'headline', flat=True)
+Traceback (most recent call last):
+...
+TypeError: 'flat' is not valid when values_list is called with more than one field.
-
-# Every DateField and DateTimeField creates get_next_by_FOO() and
@@ -241 +265 @@
->>> Article.objects.none().filter(headline__startswith='Article')
-[]
+>>> Article.objects.filter(headline__startswith='Article').none()
+[]
->>> Article.objects.none().count()
-0
@@ -257 +283 @@
-Traceback (most recent call last):
-    ...
-TypeError: Cannot resolve keyword 'pub_date_year' into field. Choices are: id, headline
+FieldError: Cannot resolve keyword 'pub_date_year' into field. Choices are: headline, id
-
->>> Article.objects.filter(headline__starts='Article')
-Traceback (most recent call last):
-    ...
-
+
-
-# Create some articles with a bit more interesting headlines for testing field lookups:

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

@@ -127 +127 @@
-[<Publication: Highlights for Children>, <Publication: Science News>, <Publication: Science Weekly>, <Publication: The Python Journal>]
-
+# Excluding a related item works as you would expect, too (although the SQL
+# involved is a little complex).
+>>> Article.objects.exclude(publications=p2)
+[<Article: Django lets you build Web apps easily>]
+
-# If we delete a Publication, its Articles won't be able to access it.
->>> p1.delete()

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

@@ -146 +146 @@
-
-# The underlying query only makes one join when a related table is referenced twice.
-
-null, sql, null = query._get_sql_clause()
+set
+sql = queryset.query.as_sql()[0]
->>> sql.count('INNER JOIN')
-1
-
-# The automatically joined table has a predictable name.
-article__
+
-[<Article: John's second story>, <Article: This is a test>]
-
-# And should work fine with the unicode that comes out of
-# newforms.Form.cleaned_data
-article__
+
-[<Article: John's second story>, <Article: This is a test>]
-
@@ -180 +180 @@
-Traceback (most recent call last):
-    ...
-TypeError: Cannot resolve keyword 'reporter_id' into field. Choices are: id, headline
+FieldError: Cannot resolve keyword 'reporter_id' into field. Choices are: headline, id
-
-# You need to specify a comparison clause
@@ -186 +186 @@
-Traceback (most recent call last):
-    ...
-TypeError: Cannot resolve keyword 'reporter_id' into field. Choices are: id, headline
+FieldError: Cannot resolve keyword 'reporter_id' into field. Choices are: headline, id
-
-# You can also instantiate an Article by passing
@@ -250 +250 @@
->>> Reporter.objects.filter(article__reporter=r).distinct()
-[<Reporter: John Smith>]
+
+# It's possible to use values() calls across many-to-one relations. (Note, too, that we clear the ordering here so as not to drag the 'headline' field into the columns being used to determine uniqueness.)
+>>> d = {'reporter__first_name': u'John', 'reporter__last_name': u'Smith'}
+>>> list(Article.objects.filter(reporter=r).distinct().order_by().values('reporter__first_name', 'reporter__last_name')) == [d]
+True
-
-# If you delete a reporter, his articles will be deleted.

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

@@ -81 +81 @@
-[<Article: Third>]
-
+# We can achieve the same thing by filtering for the case where the reporter is
+# None.
+>>> Article.objects.filter(reporter=None)
+[<Article: Third>]
+
-# Set the reporter for the Third article
->>> r.article_set.add(a3)

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

@@ -2 +2 @@
-XX. Model inheritance
-
-
+
+
+
+
+
+
+
+
+
-"""
-
-from django.db import models
+
+#
+# Abstract base classes
+#
+
+class CommonInfo(models.Model):
+    name = models.CharField(max_length=50)
+    age = models.PositiveIntegerField()
+
+    class Meta:
+        abstract = True
+        ordering = ['name']
+
+    def __unicode__(self):
+        return u'%s %s' % (self.__class__.__name__, self.name)
+
+class Worker(CommonInfo):
+    job = models.CharField(max_length=50)
+
+class Student(CommonInfo):
+    school_class = models.CharField(max_length=10)
+
+    class Meta:
+        pass
+
+#
+# Multi-table inheritance
+#
+
+class Chef(models.Model):
+    name = models.CharField(max_length=50)
+
+    def __unicode__(self):
+        return u"%s the chef" % self.name
-
-class Place(models.Model):
@@ -14 +56 @@
-        return u"%s the place" % self.name
-
-
+
+
+
+
+
+
+
+
-    serves_hot_dogs = models.BooleanField()
-    serves_pizza = models.BooleanField()
+    chef = models.ForeignKey(Chef, null=True, blank=True)
+
+    class Meta(Rating.Meta):
+        db_table = 'my_restaurant'
-
-    def __unicode__(self):
@@ -27 +80 @@
-        return u"%s the italian restaurant" % self.name
-
+class Supplier(Place):
+    customers = models.ManyToManyField(Restaurant, related_name='provider')
+
+    def __unicode__(self):
+        return u"%s the supplier" % self.name
+
+class ParkingLot(Place):
+    # An explicit link to the parent (we can control the attribute name).
+    parent = models.OneToOneField(Place, primary_key=True, parent_link=True)
+    main_site = models.ForeignKey(Place, related_name='lot')
+
+    def __unicode__(self):
+        return u"%s the parking lot" % self.name
+
-__test__ = {'API_TESTS':"""
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# Create a couple of Places.
@@ -42 +139 @@
->>> p2.save()
-
-# 
- serves_hot_dogs=True, serves_pizza=False
+
+serves_hot_dogs=True, serves_pizza=False, rating=2
->>> r.save()
-
-# Test the constructor for ItalianRestaurant.
-
+
+
+
->>> ir.save()
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-"""}

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

@@ -7 +7 @@
-"""
-
-
+, connection
-
-class Place(models.Model):
@@ -17 +17 @@
-
-class Restaurant(models.Model):
-
+, primary_key=True
-    serves_hot_dogs = models.BooleanField()
-    serves_pizza = models.BooleanField()
@@ -38 +38 @@
-    link = models.OneToOneField(ManualPrimaryKey)
-    name = models.CharField(max_length = 50)
+
+class MultiModel(models.Model):
+    link1 = models.OneToOneField(Place)
+    link2 = models.OneToOneField(ManualPrimaryKey)
+    name = models.CharField(max_length=50)
+
+    def __unicode__(self):
+        return u"Multimodel %s" % self.name
-
-__test__ = {'API_TESTS':"""
@@ -64 +72 @@
-DoesNotExist: Restaurant matching query does not exist.
-
- Restaurant,
-
+
+Restaurant, 
->>> r.place = p2
->>> r.save()
@@ -73 +81 @@
-<Place: Ace Hardware the place>
-
-
-Need to reget restaurant object first, because the reverse set
-can't update the 
+. Need to
+reload restaurant object first, because the reverse set can't update the
+
->>> p1.restaurant = r
->>> r.save()
@@ -87 +95 @@
-# Restaurant.objects.all() just returns the Restaurants, not the Places.
-# Note that there are two restaurants - Ace Hardware the Restaurant was created
-
-
+
->>> Restaurant.objects.all()
-[<Restaurant: Demon Dogs the restaurant>, <Restaurant: Ace Hardware the restaurant>]
@@ -166 +173 @@
->>> o2 = RelatedModel(link=o1, name="secondary")
->>> o2.save()
+
+# You can have multiple one-to-one fields on a model, too.
+>>> x1 = MultiModel(link1=p1, link2=o1, name="x1")
+>>> x1.save()
+>>> o1.multimodel
+<MultiModel: Multimodel x1>
+
+# This will fail because each one-to-one field must be unique (and link2=o1 was
+# used for x1, above).
+>>> MultiModel(link1=p2, link2=o1, name="x1").save()
+Traceback (most recent call last):
+    ...
+IntegrityError: ...
+
+# Because the unittests all use a single connection, we need to force a
+# reconnect here to ensure the connection is clean (after the previous
+# IntegrityError).
+>>> connection.close()
-"""}

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

@@ -49 +49 @@
-[<Article: Article 1>, <Article: Article 3>, <Article: Article 2>, <Article: Article 4>]
-
+# Only the last order_by has any effect (since they each override any previous
+# ordering).
+>>> Article.objects.order_by('id')
+[<Article: Article 1>, <Article: Article 2>, <Article: Article 3>, <Article: Article 4>]
+>>> Article.objects.order_by('id').order_by('-headline')
+[<Article: Article 4>, <Article: Article 3>, <Article: Article 2>, <Article: Article 1>]
+
-# Use the 'stop' part of slicing notation to limit the results.
->>> Article.objects.order_by('headline')[:2]
@@ -65 +72 @@
->>> Article.objects.order_by('?')
-[...]
+
+# Ordering can be reversed using the reverse() method on a queryset. This
+# allows you to extract things like "the last two items" (reverse and then
+# take the first two).
+>>> Article.objects.all().reverse()[:2]
+[<Article: Article 1>, <Article: Article 3>]
-"""}

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

@@ -5 +5 @@
-combine QuerySet objects using & and | operators.
-
-
-
-
-
-
+
+
+
-"""
-
@@ -73 +71 @@
->>> Article.objects.filter(pk__in=[1,2,3])
-[<Article: Hello>, <Article: Goodbye>, <Article: Hello and goodbye>]
+>>> Article.objects.filter(pk__in=(1,2,3))
+[<Article: Hello>, <Article: Goodbye>, <Article: Hello and goodbye>]
-
->>> Article.objects.filter(pk__in=[1,2,3,4])
@@ -92 +92 @@
->>> Article.objects.filter(Q(headline__contains='bye'), headline__startswith='Hello')
-[<Article: Hello and goodbye>]
+
+# Q objects can be negated
+>>> Article.objects.filter(Q(pk=1) | ~Q(pk=2))
+[<Article: Hello>, <Article: Hello and goodbye>]
+>>> Article.objects.filter(~Q(pk=1) & ~Q(pk=2))
+[<Article: Hello and goodbye>]
+
+# This allows for more complex queries than filter() and exclude() alone would
+# allow
+>>> Article.objects.filter(Q(pk=1) & (~Q(pk=2) | Q(pk=3)))
+[<Article: Hello>]
-
-# Try some arg queries with operations other than filter.

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

@@ -46 +46 @@
->>> print v.where
-2005-01-01
->>> Thing.objects.order_by('select.when')
-[<Thing: a>, <Thing: h>]
-
->>> Thing.objects.dates('where', 'year')

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

@@ -56 +56 @@
-Traceback (most recent call last):
-    ...
-
+
-"""}

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

@@ -28 +28 @@
-    def __unicode__(self):
-        return self.name
-
+
-class Klass(models.Model):
-    name = models.CharField(max_length=50)
@@ -34 +34 @@
-    def __unicode__(self):
-        return self.name
-
+
-class Order(models.Model):
-    name = models.CharField(max_length=50)
@@ -64 +64 @@
-    models = [Domain, Kingdom, Phylum, Klass, Order, Family, Genus, Species]
-    assert len(names) == len(models), (names, models)
-
+
-    parent = None
-    for name, model in zip(names, models):
@@ -101 +101 @@
-# However, a select_related() call will fill in those related objects without any extra queries:
->>> db.reset_queries()
-
+depth=10
->>> person.genus.family.order.klass.phylum.kingdom.domain
-<Domain: Eukaryota>
@@ -130 +130 @@
-<Domain: Eukaryota>
-
- query
+er queries
->>> len(db.connection.queries)
-7
@@ -148 +148 @@
-5
-
+>>> s = Species.objects.all().select_related(depth=1).extra(select={'a': 'select_related_species.id + 10'})[0]
+>>> s.id + 10 == s.a
+True
+
+# The optional fields passed to select_related() control which related models
+# we pull in. This allows for smaller queries and can act as an alternative
+# (or, in addition to) the depth parameter.
+
+# In the next two cases, we explicitly say to select the 'genus' and
+# 'genus.family' models, leading to the same number of queries as before.
+>>> db.reset_queries()
+>>> world = Species.objects.select_related('genus__family')
+>>> [o.genus.family for o in world]
+[<Family: Drosophilidae>, <Family: Hominidae>, <Family: Fabaceae>, <Family: Amanitacae>]
+>>> len(db.connection.queries)
+1
+
+>>> db.reset_queries()
+>>> world = Species.objects.filter(genus__name='Amanita').select_related('genus__family')
+>>> [o.genus.family.order for o in world]
+[<Order: Agaricales>]
+>>> len(db.connection.queries)
+2
+
+>>> db.reset_queries()
+>>> Species.objects.all().select_related('genus__family__order').order_by('id')[0:1].get().genus.family.order.name
+u'Diptera'
+>>> len(db.connection.queries)
+1
+
+# Specifying both "depth" and fields is an error.
+>>> Species.objects.select_related('genus__family__order', depth=4)
+Traceback (most recent call last):
+...
+TypeError: Cannot pass both "depth" and fields to select_related()
+
-# Reset DEBUG to where we found it.
->>> settings.DEBUG = False
-"""}
+

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

@@ -23 +23 @@
-    class Meta:
-        ordering = ('name',)
-
+
-    def __unicode__(self):
-        return self.name
@@ -40 +40 @@
-
-class AuthorProfile(models.Model):
-
+, primary_key=True
-    date_of_birth = models.DateField()
-
+
-    def __unicode__(self):
-        return u"Profile of %s" % self.author
-
+
-class Actor(models.Model):
-    name = models.CharField(max_length=20, primary_key=True)
@@ -51 +51 @@
-    class Meta:
-        ordering = ('name',)
-
+
-    def __unicode__(self):
-        return self.name
-
+
-class Movie(models.Model):
-    actor = models.ForeignKey(Actor)
@@ -64 +64 @@
-    def __unicode__(self):
-        return self.title
-
+
-class Score(models.Model):
-    score = models.FloatField()
@@ -101 +101 @@
-
-# Deserializing has a similar interface, except that special DeserializedObject
- 
+
-# database since the data was serialized (we'll simulate that below).
->>> for obj in serializers.deserialize("xml", xml):
@@ -149 +149 @@
-[<Article: Just kidding; I love TV poker>, <Article: Time to reform copyright>]
-
- 
+
-# it doesn't appear in the serialized field list - it replaces the
-# pk identifier.
@@ -187 +187 @@
-[{"pk": 1, "model": "serializers.article", "fields": {"headline": "Just kidding; I love TV poker", "pub_date": "2006-06-16 11:00:00"}}, {"pk": 2, "model": "serializers.article", "fields": {"headline": "Time to reform copyright", "pub_date": "2006-06-16 13:00:11"}}, {"pk": 3, "model": "serializers.article", "fields": {"headline": "Forward references pose no problem", "pub_date": "2006-06-16 15:00:00"}}]
-
- 
+
-# which is 'varchar'
->>> ac = Actor(name="Zażółć")
@@ -248 +248 @@
-<BLANKLINE>
-
- 
- 
+
+
-...     print i
-<DeserializedObject: Just kidding; I love TV poker>
@@ -255 +255 @@
-
-"""
-
-
+
+
+

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

@@ -67 +67 @@
-Is updated
-
-
+
+
-pre_save_nokwargs signal
-pre_save signal, Tom Smith

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

@@ -26 +26 @@
-building_docs = getattr(settings, 'BUILDING_DOCS', False)
-
-!= 'mysql'
+not in ('mysql', 'mysql_old')
-    __test__['API_TESTS'] += """
-# the default behavior is to autocommit after each save() action