django-cte 2.0.0.dev20250610173146__py3-none-any.whl → 2.0.0.dev20251006115930__py3-none-any.whl

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/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

{django_cte-2.0.0.dev20250610173146.dist-info → django_cte-2.0.0.dev20251006115930.dist-info}/METADATA

@@ -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.dist-info → django_cte-2.0.0.dev20251006115930.dist-info}/RECORD

@@ -1,12 +1,12 @@
-django_cte/__init__.py,sha256=4SGKhYSndhDMgsYFQAadko2b7WTByry4YYzqyOOKZc4,141
+django_cte/__init__.py,sha256=L9F3ddna9UPgqOnoiy2WRImQBNi6YKcbuhu4zGW93Zk,141
 django_cte/_deprecated.py,sha256=OAEmWVqnoi-27m2nyrfTIwVwPE1J8VLrfspgRHW-EZI,5623
-django_cte/cte.py,sha256=Rs_luCEFK39UEOm4rRaL2L5BztfvN9ST-Y7RVrjub_c,8129
+django_cte/cte.py,sha256=QlOiu3kTobYakg36SLIzTrhB5bWPtgGiihpu1jYgcqY,8129
 django_cte/jitmixin.py,sha256=JRTRlbBhD8XD0GHwxg8wKdJSbcTv_zUrSyqtOSfgM5M,885
 django_cte/join.py,sha256=2b1iBKFFiqBqYBmX4W9q2RfX17xXjZbbzClpUdbnUtA,3156
 django_cte/meta.py,sha256=gNBtegkvg5CXcEPyt1nZMIF2UlsPMTUPStVJSsRni3I,3491
 django_cte/query.py,sha256=djY7Bknl_NQSd1g6zy8N3fU3h2r8OfpyeJY_Zt9a7fg,5582
 django_cte/raw.py,sha256=6_YDCKBsgXx1oQku4EcyK4qJmnmiyzEeZRxiYdkg8Y8,1045
-django_cte-2.0.0.dev20250610173146.dist-info/licenses/LICENSE,sha256=mkLNw_QhpZ40jBEbuAosqH4ciA3KMrwb8aSYbTmy5gc,1508
-django_cte-2.0.0.dev20250610173146.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-django_cte-2.0.0.dev20250610173146.dist-info/METADATA,sha256=2hqFagZWfP3zraJj8CyeLxrbdNrp5DESgsCqzSW1Tyc,2696
-django_cte-2.0.0.dev20250610173146.dist-info/RECORD,,
+django_cte-2.0.0.dev20251006115930.dist-info/licenses/LICENSE,sha256=mkLNw_QhpZ40jBEbuAosqH4ciA3KMrwb8aSYbTmy5gc,1508
+django_cte-2.0.0.dev20251006115930.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+django_cte-2.0.0.dev20251006115930.dist-info/METADATA,sha256=GBh26fB_8R6SZG_KcoiyWpf-xqnmgzbtnyB5lWwzx5g,2696
+django_cte-2.0.0.dev20251006115930.dist-info/RECORD,,