django-cte 1.3.3.dev20250530125340__py3-none-any.whl → 1.3.3.dev20250603184036__py3-none-any.whl

django_cte/__init__.py

@@ -1,3 +1,3 @@
 from .cte import CTEManager, CTEQuerySet, With  # noqa
 
-__version__ = "1.3.3.dev20250530125340"
+__version__ = "1.3.3.dev20250603184036"

django_cte/cte.py

@@ -113,8 +113,7 @@ class With(object):
             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 @@ class With(object):
     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)
 
 

{django_cte-1.3.3.dev20250530125340.dist-info → django_cte-1.3.3.dev20250603184036.dist-info}/METADATA

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

{django_cte-1.3.3.dev20250530125340.dist-info → django_cte-1.3.3.dev20250603184036.dist-info}/RECORD

@@ -1,11 +1,11 @@
-django_cte/__init__.py,sha256=2ZCHug6-KqXs56srJW5rsMCPOLRB4nrWiHm0Jy3--k8,96
-django_cte/cte.py,sha256=ihU73uLUcDk0twufGA9GjC4neiEYM-WKq_zVmiAFE4U,8243
+django_cte/__init__.py,sha256=b1PEHSsmmHm5lcRB_dYxWWuraxZ-ERMNrYTDvsCYfJM,96
+django_cte/cte.py,sha256=cY9Dh5EKeIy3VG1ZVxn2j-JjfqW-AAqMFMz-f16vsa4,8198
 django_cte/expressions.py,sha256=3MDu2ldum3LhRVX1U6jiyzR83avFG53H7P72IkgoD-w,1780
 django_cte/join.py,sha256=HrO31WKx3j5RiEWf7dDOXbBfeeUPFEbNLo3gzzt3qbo,3164
 django_cte/meta.py,sha256=PIu7iW_tu3gBCpiBRfVHvuJKSSND2IsaNhoT01WEEJM,3535
 django_cte/query.py,sha256=zIDvWchXtLSc7o1PWp_t2UDDHknuFlfn3DPlDqfjWa0,6753
 django_cte/raw.py,sha256=nROVPEVRc3_zKAFcED6KR8Rr6FTTn8jQDFQWfi-X3-A,1077
-django_cte-1.3.3.dev20250530125340.dist-info/licenses/LICENSE,sha256=mkLNw_QhpZ40jBEbuAosqH4ciA3KMrwb8aSYbTmy5gc,1508
-django_cte-1.3.3.dev20250530125340.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-django_cte-1.3.3.dev20250530125340.dist-info/METADATA,sha256=84e0zmdp5yOeAt6-O69Y1VHyZj-AqfTUGJip4l9l2Kw,2696
-django_cte-1.3.3.dev20250530125340.dist-info/RECORD,,
+django_cte-1.3.3.dev20250603184036.dist-info/licenses/LICENSE,sha256=mkLNw_QhpZ40jBEbuAosqH4ciA3KMrwb8aSYbTmy5gc,1508
+django_cte-1.3.3.dev20250603184036.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+django_cte-1.3.3.dev20250603184036.dist-info/METADATA,sha256=jtDJRcU5PU5z2dhXwU2vOGXcRLNBp-BQeOAokx2YtqM,2696
+django_cte-1.3.3.dev20250603184036.dist-info/RECORD,,