Ticket #15959: 15959-r16345.diff

django/db/models/query.py

@@ -1126 +1126 @@
         """
         return self
 
+    def values(self, *fields):
+        """
+        Always returns EmptyQuerySet.
+        """
+        return self
+
+    def values_list(self, *fields, **kwargs):
+        """
+        Always returns EmptyQuerySet.
+        """
+        return self
+
     def update(self, **kwargs):
         """
         Don't update anything.

tests/regressiontests/queries/tests.py

@@ -1471 +1471 @@
             Number.objects.none().values('num').order_by('num'), []
         )
 
+    def test_bare_emptyqueryset_values(self):
+        # #15959 -- .values()/.values_list() fails on EmptyQuerySet
+        self.assertQuerysetEqual(
+            EmptyQuerySet().values('id'), []
+        )
+        self.assertQuerysetEqual(
+            EmptyQuerySet().values_list('id', flat=False), []
+        )
+
     def test_values_subquery(self):
         self.assertQuerysetEqual(
             Number.objects.filter(pk__in=Number.objects.none().values("pk")),