django-cte 2.0.0.dev20251006115930__tar.gz → 2.0.1.dev20251006193645__tar.gz

{django_cte-2.0.0.dev20251006115930 → django_cte-2.0.1.dev20251006193645}/PKG-INFO

@@ -1,15 +1,14 @@
 Metadata-Version: 2.4
 Name: django-cte
-Version: 2.0.0.dev20251006115930
+Version: 2.0.1.dev20251006193645
 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.dev20251006115930 → django_cte-2.0.1.dev20251006193645}/django_cte/__init__.py

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

{django_cte-2.0.0.dev20251006115930 → django_cte-2.0.1.dev20251006193645}/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.
@@ -140,7 +139,8 @@ class CTE:
         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))
+                output_field = cte_query.resolve_ref(alias).output_field
+                col = CTEColumnRef(alias, self.name, output_field)
                 query.add_annotation(col, alias)
 
         qs.query = query

{django_cte-2.0.0.dev20251006115930 → django_cte-2.0.1.dev20251006193645}/pyproject.toml

@@ -2,7 +2,8 @@
 name = "django-cte"
 description = "Common Table Expressions (CTE) for Django"
 authors = [{name = "Daniel Miller", email = "millerdev@gmail.com"}]
-license = {file = "LICENSE"}
+license = "BSD-3-Clause"
+license-files = ["LICENSE"]
 readme = {file = "README.md", content-type = "text/markdown"}
 dynamic = ["version"]
 requires-python = ">= 3.9"
@@ -11,9 +12,7 @@ requires-python = ">= 3.9"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     'Environment :: Web Environment',
-    'Framework :: Django',
     'Intended Audience :: Developers',
-    'License :: OSI Approved :: BSD License',
     'Operating System :: OS Independent',
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',