diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2018-04-13 12:15:52 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2018-04-13 12:27:00 +0200 |
| commit | 3619d322098ae3573707adae22cb0c086e948210 (patch) | |
| tree | de0ff1ef0e7733102e42b6601f3de456cebce303 /docs | |
| parent | 75a4576e5f1777d33bb75cc6224733a9ce750948 (diff) | |
[2.0.x] Fixed #29286 -- Fixed column mismatch crash with QuerySet.values() or values_list() after combining an annotated and unannotated queryset with union(), difference(), or intersection().
Regression in a0c03c62a8ac586e5be5b21393c925afa581efaf.
Thanks Tim Graham and Carlton Gibson for reviews.
Backport of 0b66c3b442875627fa6daef4ac1e90900d74290b from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/releases/1.11.13.txt | 5 | ||||
| -rw-r--r-- | docs/releases/2.0.5.txt | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/docs/releases/1.11.13.txt b/docs/releases/1.11.13.txt index f72ccd8fd2..4c55454bcd 100644 --- a/docs/releases/1.11.13.txt +++ b/docs/releases/1.11.13.txt @@ -15,3 +15,8 @@ Bugfixes * Fixed crashes in ``django.contrib.admindocs`` when a view is a callable object, such as ``django.contrib.syndication.views.Feed`` (:ticket:`29296`). + +* Fixed a regression in Django 1.11.12 where ``QuerySet.values()`` or + ``values_list()`` after combining an annotated and unannotated queryset with + ``union()``, ``difference()``, or ``intersection()`` crashed due to mismatching + columns (:ticket:`29286`). diff --git a/docs/releases/2.0.5.txt b/docs/releases/2.0.5.txt index 7107ba63e7..02b8fcd21b 100644 --- a/docs/releases/2.0.5.txt +++ b/docs/releases/2.0.5.txt @@ -18,3 +18,8 @@ Bugfixes * Fixed crashes in ``django.contrib.admindocs`` when a view is a callable object, such as ``django.contrib.syndication.views.Feed`` (:ticket:`29296`). + +* Fixed a regression in Django 1.11.12 where ``QuerySet.values()`` or + ``values_list()`` after combining an annotated and unannotated queryset with + ``union()``, ``difference()``, or ``intersection()`` crashed due to mismatching + columns (:ticket:`29286`). |