Changeset 5385

Timestamp:

05/30/07 21:22:41 (1 year ago)

Author:

jacob

Message:

Fixed #3050: you can now use extra(select=...) with values(). Thanks, Honza Kral

Files:

• django/trunk/django/db/models/query.py (modified) (3 diffs)
• django/trunk/tests/modeltests/lookup/models.py (modified) (1 diff)

django/trunk/django/db/models/query.py

@@ -555 +555 @@
-    def __init__(self, *args, **kwargs):
-        super(ValuesQuerySet, self).__init__(*args, **kwargs)
-and select are
+is
-        self._select_related = False
-        self._select = {}
-
-    def iterator(self):
@@ -567 +566 @@
-        # self._fields is a list of field names to fetch.
-        if self._fields:
-
+
+
+
+
+
+
+
+
+
+
+
-            field_names = self._fields
-        else: # Default to all fields.
@@ -574 +583 @@
-
-        select = ['%s.%s' % (backend.quote_name(self.model._meta.db_table), backend.quote_name(c)) for c in columns]
+
+        # Add any additional SELECTs.
+        if self._select:
+            select.extend(['(%s) AS %s' % (quote_only_if_word(s[1]), backend.quote_name(s[0])) for s in self._select.items()])
+
-        cursor = connection.cursor()
-        cursor.execute("SELECT " + (self._distinct and "DISTINCT " or "") + ",".join(select) + sql, params)

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

@@ -132 +132 @@
-[('headline', 'Article 1'), ('id', 1)]
-
+
+# you can use values() even on extra fields
+>>> for d in Article.objects.extra( select={'id_plus_one' : 'id + 1'} ).values('id', 'id_plus_one'):
+...     i = d.items()
+...     i.sort()
+...     i
+[('id', 5), ('id_plus_one', 6)]
+[('id', 6), ('id_plus_one', 7)]
+[('id', 4), ('id_plus_one', 5)]
+[('id', 2), ('id_plus_one', 3)]
+[('id', 3), ('id_plus_one', 4)]
+[('id', 7), ('id_plus_one', 8)]
+[('id', 1), ('id_plus_one', 2)]
+
+# however, an exception FieldDoesNotExist will still be thrown 
+# if you try to access non-existent field (field that is neither on the model nor extra)
+>>> Article.objects.extra( select={'id_plus_one' : 'id + 1'} ).values('id', 'id_plus_two')
+Traceback (most recent call last):
+    ...
+FieldDoesNotExist: Article has no field named 'id_plus_two'
+
-# if you don't specify which fields, all are returned
->>> list(Article.objects.filter(id=5).values()) == [{'id': 5, 'headline': 'Article 5', 'pub_date': datetime(2005, 8, 1, 9, 0)}]