Ticket #2482: valuelist.diff

django/db/models/query.py

@@ -308 +308 @@
-    def values(self, *fields):
-        return self._clone(klass=ValuesQuerySet, _fields=fields)
-
+    def valuelist(self, *fields):
+        return self._clone(klass=ValueListQuerySet, _fields=fields)
+
-    def dates(self, field_name, kind, order='ASC'):
-        """
-        Returns a list of datetime objects representing all available dates
@@ -509 +512 @@
-        return select, " ".join(sql), params
-
-class ValuesQuerySet(QuerySet):
-
+
+
+
+
+
+
+
+
+
+
-        # select_related and select aren't supported in values().
-        self._select_related = False
-        self._select = {}
-
-
-
-
-
-
-
-
-
+
-        cursor = connection.cursor()
-        select, sql, params = self._get_sql_clause()
-        select = ['%s.%s' % (backend.quote_name(self.model._meta.db_table), backend.quote_name(c)) for c in columns]
-        cursor.execute("SELECT " + (self._distinct and "DISTINCT " or "") + ",".join(select) + sql, params)
+        return cursor
+
+    def iterator(self):
+        cursor = self.get_values_cursor()
+        field_names = self.get_field_names()
-        while 1:
-            rows = cursor.fetchmany(GET_ITERATOR_CHUNK_SIZE)
-            if not rows:
@@ -538 +548 @@
-        c._fields = self._fields[:]
-        return c
-
+class ValueListQuerySet(ValuesQuerySet):
+    def iterator(self):
+        cursor = self.get_values_cursor()
+        while 1:
+            rows = cursor.fetchmany(GET_ITERATOR_CHUNK_SIZE)
+            if not rows:
+                raise StopIteration
+            for row in rows:
+                if len(row) == 1:
+                    yield row[0]
+                else:
+                    yield tuple(row)
+
+    def _clone(self, klass=None, **kwargs):
+        c = super(ValueListQuerySet, self)._clone(klass, **kwargs)
+        c._fields = self._fields[:]
+        return c
+
-class DateQuerySet(QuerySet):
-    def iterator(self):
-        from django.db.backends.util import typecast_timestamp

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
-
+# valuelist() returns a list of object field values instead of object instances.  Like
+# values(), you can specify the fields whose values you want to retrieve.
+>>> list(Article.objects.order_by('id').valuelist('id')) == [1, 2, 3, 4, 5, 6, 7]
+True
+
+# if you specify more than one field, a list of tuples of field values is returned
+>>> for t in Article.objects.order_by('id').valuelist('id', 'headline'):
+...     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