Merge ~lvoytek/ubuntu/+source/django-cte:django4-compatibility into ubuntu/+source/django-cte:ubuntu/devel

[Lena Voytek]

Fix Django 4.2 compatibility by ignoring generated SQL aliases. This is currently the easiest fix for the new version, but will likely be different when updated upstream. I noted in the patch that it should be removed once a new upstream version with the fix is merged in.

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/django-4-mantic

local autopkgtest results:

autopkgtest [10:30:45]: @@@@@@@@@@@@@@@@@@@@ summary
run-tests PASS
qemu-system-x86_64: terminating on signal 15 from pid 36401 (/usr/bin/python3)

[Lukas Märdian (slyon)]

Thank you very much!

This is a simple and clean patch, using proper DEP-3 headers and evidence was provided that the code had been properly tested (PPA build + local autopkgtests).

Your comment in the patch description about an alternative upstream solution is also a good hint for the future.

LGTM!

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: slyon, lvoytek
Uploaders: slyon
MP auto-approved

review: Approve

[Lukas Märdian (slyon)]

https://launchpad.net/ubuntu/+source/django-cte/1.3.0-1ubuntu1

diff --git a/debian/changelog b/debian/changelog
index 6c316b0..297ec1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+django-cte (1.3.0-1ubuntu1) mantic; urgency=medium
+
+  * d/p/fix-column-alias-django4.patch: Remove SQL column aliases as a
+    workaround for Django 4 introducing aliases that break access to
+    rootmap.name (LP: #2022089)
+
+ -- Lena Voytek <[e-mail]>  Thu, 31 Aug 2023 09:19:08 -0700
+
 django-cte (1.3.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index fa8da4c..ab25f13 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: django-cte
-Maintainer: Debian Python Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Team <[e-mail]>
 Uploaders: Edward Betts <[e-mail]>
 Section: python
 Priority: optional
diff --git a/debian/patches/fix-column-alias-django4.patch b/debian/patches/fix-column-alias-django4.patch
new file mode 100644
index 0000000..03828db
--- /dev/null
+++ b/debian/patches/fix-column-alias-django4.patch
@@ -0,0 +1,30 @@
+Description: Do not use Django 4.2 column aliases so rootmap.name is accessible
+ When Django 4.2 was released, it added a commit that generated explicit
+ aliases in generated SQL. This leads to a situation in the current version of
+ django-cte where query executions fail due to rootmap's "name" attribute being
+ aliased to "col1". There is an ongoing discussion as to how to move forward
+ with this in future django-cte versions in the attached bug, but the current
+ best workaround is to avoid using aliases when generating SQL statements in
+ the CTEQueryCompiler class. The final solution to this will likely be
+ different though, with some drafts in progress, such as:
+ https://github.com/dimagi/django-cte/pull/59
+ As such this patch will need to be removed once a newer version with the bug
+ fixed is merged.
+Author: Lena Voytek <[e-mail]>
+Bug: https://github.com/dimagi/django-cte/issues/66
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/mantic/+source/django-cte/+bug/2022089
+Forwarded: not-needed
+Last-Update: 2023-08-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/django_cte/query.py
++++ b/django_cte/query.py
+@@ -133,6 +133,8 @@
+ class CTEQueryCompiler(SQLCompiler):
+ 
+     def as_sql(self, *args, **kwargs):
++        with_col_aliases = kwargs.pop('with_col_aliases', None)
++
+         def _as_sql():
+             return super(CTEQueryCompiler, self).as_sql(*args, **kwargs)
+         return CTECompiler.generate_sql(self.connection, self.query, _as_sql)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0f456fa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-column-alias-django4.patch