Changeset 7477 for django/trunk/tests/modeltests/lookup

Timestamp:

04/26/08 21:50:16 (7 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/lookup/models.py (modified) (3 diffs)

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: