django-cte 2.0.0.dev20250610173146__tar.gz → 2.0.0.dev20251006115930__tar.gz

{django_cte-2.0.0.dev20250610173146 → django_cte-2.0.0.dev20251006115930}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-cte
-Version: 2.0.0.dev20250610173146
+Version: 2.0.0.dev20251006115930
 Summary: Common Table Expressions (CTE) for Django
 Author-email: Daniel Miller <millerdev@gmail.com>
 Requires-Python: >= 3.9

{django_cte-2.0.0.dev20250610173146 → django_cte-2.0.0.dev20251006115930}/django_cte/__init__.py

@@ -1,4 +1,4 @@
 from .cte import CTE, with_cte, CTEManager, CTEQuerySet, With  # noqa
 
-__version__ = "2.0.0.dev20250610173146"
+__version__ = "2.0.0.dev20251006115930"
 __all__ = ["CTE", "with_cte"]

{django_cte-2.0.0.dev20250610173146 → django_cte-2.0.0.dev20251006115930}/django_cte/cte.py

@@ -133,15 +133,15 @@ class CTE:
         if cte_query.values_select:
             query.set_values(cte_query.values_select)
             qs._iterable_class = ValuesIterable
-        for alias in getattr(cte_query, "selected", None) or ():
-            if alias not in cte_query.annotations:
-                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():
                 col = CTEColumnRef(alias, self.name, value.output_field)
                 query.add_annotation(col, alias)
         query.annotation_select_mask = cte_query.annotation_select_mask
+        for alias in getattr(cte_query, "selected", None) or ():
+            if alias not in cte_query.annotations:
+                col = Ref(alias, cte_query.resolve_ref(alias))
+                query.add_annotation(col, alias)
 
         qs.query = query
         return qs