diff options
| author | Amr Anwar <amranwar945@gmail.com> | 2018-03-19 09:58:50 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-03-19 21:05:59 -0400 |
| commit | 9123fd75caa595c018d4121575cbada80226b4f2 (patch) | |
| tree | 209cca5b52f5e6eb8a90c817a3641bd6eb4c396c /docs | |
| parent | 80cd6fd55af80218d24fd8ce9bb93b7704e939df (diff) | |
[2.0.x] Fixed #29229 -- Fixed column mismatch crash when combining two annotated values_list() querysets with union(), difference(), or intersection().
Regression in 7316720603821ebb64dfe8fa592ba6edcef5f3e.
Backport of a0c03c62a8ac586e5be5b21393c925afa581efaf from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/1.11.12.txt | 4 | ||||
| -rw-r--r-- | docs/releases/2.0.4.txt | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/releases/1.11.12.txt b/docs/releases/1.11.12.txt index aa0035a3c3..64130c065e 100644 --- a/docs/releases/1.11.12.txt +++ b/docs/releases/1.11.12.txt @@ -9,4 +9,6 @@ Django 1.11.12 fixes a bug in 1.11.11. Bugfixes ======== -* ... +* Fixed a regression in Django 1.11.8 where combining two annotated + ``values_list()`` querysets with ``union()``, ``difference()``, or + ``intersection()`` crashed due to mismatching columns (:ticket:`29229`). diff --git a/docs/releases/2.0.4.txt b/docs/releases/2.0.4.txt index e38c16ed1d..6614808990 100644 --- a/docs/releases/2.0.4.txt +++ b/docs/releases/2.0.4.txt @@ -21,3 +21,8 @@ Bugfixes * Fixed ``PasswordResetConfirmView`` crash when using a user model with a ``UUIDField`` primary key and the reset URL contains an encoded primary key value that decodes to a non-UUID (:ticket:`29206`). + value that decodes to an invalid UUID (:ticket:`29206`). + +* Fixed a regression in Django 1.11.8 where combining two annotated + ``values_list()`` querysets with ``union()``, ``difference()``, or + ``intersection()`` crashed due to mismatching columns (:ticket:`29229`). |