django-cte 2.0.0.dev20250616152647__py3-none-any.whl → 2.0.1.dev20251006182758__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.dev20250616152647"
+__version__ = "2.0.1.dev20251006182758"
 __all__ = ["CTE", "with_cte"]

django_cte/cte.py

@@ -58,7 +58,7 @@ class CTE:
         self.col = CTEColumns(self)
 
     def __repr__(self):
-        return "<With {}>".format(self.name)
+        return f"<{type(self).__name__} {self.name}>"
 
     @classmethod
     def recursive(cls, make_cte_queryset, name="cte", materialized=False):
@@ -80,7 +80,6 @@ class CTE:
         """Join this CTE to the given model or queryset
 
         This CTE will be referenced by the returned queryset, but the
-
         corresponding `WITH ...` statement will not be prepended to the
         queryset's SQL output; use `with_cte(cte, select=cte.join(...))`
         to achieve that outcome.
@@ -133,15 +132,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.dev20250616152647.dist-info → django_cte-2.0.1.dev20251006182758.dist-info}/METADATA

@@ -1,15 +1,14 @@
 Metadata-Version: 2.4
 Name: django-cte
-Version: 2.0.0.dev20250616152647
+Version: 2.0.1.dev20251006182758
 Summary: Common Table Expressions (CTE) for Django
 Author-email: Daniel Miller <millerdev@gmail.com>
 Requires-Python: >= 3.9
 Description-Content-Type: text/markdown
+License-Expression: BSD-3-Clause
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
-Classifier: Framework :: Django
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{django_cte-2.0.0.dev20250616152647.dist-info → django_cte-2.0.1.dev20251006182758.dist-info}/RECORD

@@ -1,12 +1,12 @@
-django_cte/__init__.py,sha256=QXPp-htboR_5QDL4di8vYDDanmMtUiX3myxA8tBHit0,141
+django_cte/__init__.py,sha256=azASdmHqhhwjSDGsVXjCH5eqkMIzON9T7GsJmpazLmU,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=8U0asXClTikaF--Iorsp5eKBw0aoOQSvfu22h1zZZf4,8137
 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.dev20250616152647.dist-info/licenses/LICENSE,sha256=mkLNw_QhpZ40jBEbuAosqH4ciA3KMrwb8aSYbTmy5gc,1508
-django_cte-2.0.0.dev20250616152647.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-django_cte-2.0.0.dev20250616152647.dist-info/METADATA,sha256=8mqQHNGklsOew5pf60DiJ2eFjHj9cCzPs8Sp0oSGenU,2696
-django_cte-2.0.0.dev20250616152647.dist-info/RECORD,,
+django_cte-2.0.1.dev20251006182758.dist-info/licenses/LICENSE,sha256=mkLNw_QhpZ40jBEbuAosqH4ciA3KMrwb8aSYbTmy5gc,1508
+django_cte-2.0.1.dev20251006182758.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+django_cte-2.0.1.dev20251006182758.dist-info/METADATA,sha256=5EiY1DAmbfQvAPxOjaBCuzEhNqlWbSqSK7Xv0QTYpbI,2646
+django_cte-2.0.1.dev20251006182758.dist-info/RECORD,,