Commit f33b3ebd authored by Aric Coady's avatar Aric Coady Committed by Tim Graham
Browse files

Refs #20625 -- Forwardported tests and release notes for queryset chaining fix. 

The issue was fixed on master due to the removal of ValuesQuerySet.

Partial forwardport of 7d471fe6 from stable/1.8.x
parent abd33d80

docs/releases/1.8.5.txt

+3 −0
Original line number Diff line number Diff line
@@ -36,3 +36,6 @@ Bugfixes 
* Changed ``Count`` queries to execute ``COUNT(*)`` instead of ``COUNT('*')``

  as versions of Django before 1.8 did (:ticket:`25377`). This may fix a

  performance regression on some databases.



* Fixed custom queryset chaining with ``values()`` and ``values_list()``

  (:ticket:`20625`).

tests/custom_managers/tests.py

+4 −0
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ class CustomManagerTests(TestCase): 
            self.assertEqual(list(queryset), [six.text_type("Bugs")])

            self.assertEqual(queryset._filter_CustomQuerySet, True)



            self.assertIsInstance(queryset.values(), CustomQuerySet)

            self.assertIsInstance(queryset.values().values(), CustomQuerySet)

            self.assertIsInstance(queryset.values_list().values(), CustomQuerySet)



    def test_init_args(self):

        """

        The custom manager __init__() argument has been set.