add annotation if 5.2 selected

Author: simwr872

django_cte/cte.py

@@ -112,6 +112,15 @@ def queryset(self):
         if cte_query.values_select:
             query.set_values(cte_query.values_select)
             qs._iterable_class = ValuesIterable
+            if django.VERSION >= (5, 2):
+                for alias in cte_query.values_select:
+                    if (
+                        alias not in cte_query.annotations
+                        and cte_query.has_select_fields
+                        and alias in cte_query.selected
+                    ):
+                        col = CTEColumnRef(alias, self.name, cte_query.resolve_ref(alias).output_field)
+                        query.add_annotation(col, alias)
         if cte_query.annotations:
             for alias, value in cte_query.annotations.items():
                 col = CTEColumnRef(alias, self.name, value.output_field)

tests/test_recursive.py

@@ -318,3 +318,18 @@ def make_regions_cte(cte):
         self.assertTrue(
             str(query.query).startswith('WITH RECURSIVE "cte" AS MATERIALIZED')
         )
+
+    def test_recursive_self_queryset(self):
+        def make_regions_cte(cte):
+            return Region.objects.filter(
+                pk="earth"
+            ).values("pk").union(
+                cte.join(Region, parent=cte.col.pk).values("pk")
+            )
+        cte = With.recursive(make_regions_cte)
+        queryset = cte.queryset().with_cte(cte).order_by("pk")
+        print(queryset.query)
+        self.assertEqual(list(queryset), [
+            {'pk': 'earth'},
+            {'pk': 'moon'},
+        ])