Thanks! Tests are failing unfortunately.

I'd move the or self.query.values_select before the any(annotation.is_summary...) check but apart from that it looks like an improvement.

Thanks! I replaced the hardcoded primary key values and released 0.16 containing your fix.

I didn't catch this in my testing earlier but this appears to have had the side effect that calling values() or values_list() on the base queryset now returns the objects in ordering order rather than in tree traversal order. I can possibly work around it in our project but it may be an undesired change in general - would appreciate your thoughts?

(Pdb) Location.objects.first().name
'Campus-01'  # root object, as expected
(Pdb) Location.objects.all()[:3].values_list("name", flat=True)
<LocationQuerySet ['Aisle-06', 'Aisle-13', 'Aisle-20']>    # alphabetical order by name
(Pdb) Location.objects.all()[:3].values("name")
<LocationQuerySet [{'name': 'Aisle-06'}, {'name': 'Aisle-13'}, {'name': 'Aisle-20'}]>  # alphabetical order by name

Yes, I thought about that as well. Thanks for the new patch, this one looks betterè

(It's obvious in hindsight that dropping the CTE would change the ordering of results...)