Ticket #10847: values-extra.2.diff

django/db/models/query.py

@@ -696 +696 @@
         # QuerySet.clone() will also set up the _fields attribute with the
         # names of the model fields to select.
 
+    def extra(self, *args, **kwargs):
+        q = super(ValuesQuerySet, self).extra(*args, **kwargs)
+        if q.extra_names is not None:
+            q.query.trim_extra_select(q.extra_names)
+        return q
+
     def iterator(self):
         # Purge any extra columns that haven't been explicitly asked for
         if self.extra_names is not None:
@@ -747 +753 @@
         if self.aggregate_names is not None:
             self.query.set_aggregate_mask(self.aggregate_names)
 
+        if self.extra_names is not None:
+            self.query.trim_extra_select(self.extra_names)
+
     def _clone(self, klass=None, setup=False, **kwargs):
         """
         Cloning a ValuesQuerySet preserves the current fields.

tests/regressiontests/extra_regress/models.py

@@ -35 +35 @@
     second = models.CharField(max_length=20)
     third = models.CharField(max_length=20)
 
+    def __unicode__(self):
+        return "%s-%s-%s" % (self.first, self.second, self.third)
+
 __test__ = {"API_TESTS": """
 # Regression tests for #7314 and #7372
 
@@ -189 +192 @@
 >>> TestObject.objects.extra(select=SortedDict((('foo','first'),('bar','second'),('whiz','third')))).values_list('whiz', 'first', 'bar', 'id')
 [(u'third', u'first', u'second', 1)]
 
-"""}
+>>> list(TestObject.objects.filter(pk__in=TestObject.objects.extra(select={'extra': 1}).values('pk'))) == list(TestObject.objects.all())
+True
+
+>>> TestObject.objects.values('pk').extra(select={'extra': 1})
+[{'pk': 1}]
 
+>>> TestObject.objects.filter(pk__in=TestObject.objects.values('pk').extra(select={'extra': 1}))
+[<TestObject: first-second-third>]
 
+"""}