Context Navigation

Ticket #10847: values-extra.diff

File values-extra.diff, 1.1 KB (added by Alex Gaynor, 16 years ago)

diff --git a/django/db/models/query.py b/django/db/models/query.py
index 9323e9b..5a46293 100644

                class ValuesQuerySet(QuerySet):
         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.

diff --git a/tests/regressiontests/extra_regress/models.py b/tests/regressiontests/extra_regress/models.py
index fd34982..1b0d79e 100644

                True
 >>> 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
 """}