Merge pull request #116 from dimagi/dm/fix-dj52-ref

Fix CTE ref resolution regression in Django 5.2

Author: millerdev

.github/workflows/tests.yml

@@ -47,6 +47,8 @@ jobs:
         exclude:
         - {python: '3.9', django: 'Django~=5.1.0'}
         - {python: '3.9', django: 'Django~=5.2.0'}
+    env:
+      allowed_python_failure: '3.14'
     services:
       postgres:
         image: postgres:latest
@@ -83,5 +85,6 @@ jobs:
             "PORT":"5432"
           }
       run: .venv/bin/pytest -v
+      continue-on-error: ${{ matrix.python == env.allowed_python_failure }}
     - name: Check style
       run: .venv/bin/ruff check

django_cte/cte.py

@@ -113,8 +113,7 @@ def queryset(self):
             qs._iterable_class = ValuesIterable
         for alias in getattr(cte_query, "selected", None) or ():
             if alias not in cte_query.annotations:
-                field = cte_query.resolve_ref(alias).output_field
-                col = CTEColumnRef(alias, self.name, field)
+                col = Ref(alias, cte_query.resolve_ref(alias))
                 query.add_annotation(col, alias)
         if cte_query.annotations:
             for alias, value in cte_query.annotations.items():
@@ -128,7 +127,7 @@ def queryset(self):
     def _resolve_ref(self, name):
         selected = getattr(self.query, "selected", None)
         if selected and name in selected and name not in self.query.annotations:
-            return Ref(name, self.query)
+            return Ref(name, self.query.resolve_ref(name))
         return self.query.resolve_ref(name)
 
 

tests/test_cte.py

@@ -640,3 +640,36 @@ def test_cte_select_pk(self):
             {'pk': 11},
             {'pk': 12},
         ])
+
+    def test_django52_resolve_ref_regression(self):
+        cte = With(
+            Order.objects.annotate(
+                pnt_id=F("region__parent_id"),
+                region_name=F("region__name"),
+            ).values(
+                # important: more than one query.select field
+                "region_id",
+                "amount",
+                # important: more than one query.annotations field
+                "pnt_id",
+                "region_name",
+            )
+        )
+        qs = (
+            cte.queryset()
+            .with_cte(cte)
+            .values(
+                amt=cte.col.amount,
+                pnt_id=cte.col.pnt_id,
+                region_name=cte.col.region_name,
+            )
+            .filter(region_id="earth")
+            .order_by("amount")
+        )
+        print(qs.query)
+        self.assertEqual(list(qs), [
+            {'amt': 30, 'region_name': 'earth', 'pnt_id': 'sun'},
+            {'amt': 31, 'region_name': 'earth', 'pnt_id': 'sun'},
+            {'amt': 32, 'region_name': 'earth', 'pnt_id': 'sun'},
+            {'amt': 33, 'region_name': 'earth', 'pnt_id': 'sun'},
+        ])