Ticket #2482: values-flat.diff

django/db/models/query.py

@@ -305 +305 @@
-    # PUBLIC METHODS THAT RETURN A QUERYSET SUBCLASS #
-    ##################################################
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def dates(self, field_name, kind, order='ASC'):
-        """
@@ -531 +542 @@
-            if not rows:
-                raise StopIteration
-            for row in rows:
-
+
+
+
+
+
+
+
+
+
+
-
-    def _clone(self, klass=None, **kwargs):
-        c = super(ValuesQuerySet, self)._clone(klass, **kwargs)
-        c._fields = self._fields[:]
+        c._flat = self._flat
-        return c
-
-class DateQuerySet(QuerySet):

tests/modeltests/lookup/models.py

@@ -124 +124 @@
->>> list(Article.objects.filter(id=5).values()) == [{'id': 5, 'headline': 'Article 5', 'pub_date': datetime(2005, 8, 1, 9, 0)}]
-True
-
+# if you specify only one field and pass the keyword argument flat=True, a
+# plain list of field values is returned
+>>> list(Article.objects.order_by('id').values('id', flat=True)) == [1, 2, 3, 4, 5, 6, 7]
+True
+
+# if you specify more than one field and pass the keyword argument flat=True,
+# a list of tuples of field values is returned
+>>> for t in Article.objects.order_by('id').values('id', 'headline', flat=True):
+...     t
+(1, 'Article 1')
+(2, 'Article 2')
+(3, 'Article 3')
+(4, 'Article 4')
+(5, 'Article 5')
+(6, 'Article 6')
+(7, 'Article 7')
+
-# Every DateField and DateTimeField creates get_next_by_FOO() and
-# get_previous_by_FOO() methods.
-# In the case of identical date values, these methods will use the ID as a