From 655e1ce6b1ca8df71518060ae770c3ee647b9801 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Fri, 28 Aug 2020 07:56:04 +0200
Subject: [3.1.x] Fixed #31956 -- Fixed crash of ordering by JSONField with a
 custom decoder on PostgreSQL.

Thanks Marc Debureaux for the report.
Thanks Simon Charette, Nick Pope, and Adam Johnson for reviews.

Backport of 0be51d2226fce030ac9ca840535a524f41e9832c from master
---
 docs/releases/3.1.1.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs')

diff --git a/docs/releases/3.1.1.txt b/docs/releases/3.1.1.txt
index 68c02392bd..452a922608 100644
--- a/docs/releases/3.1.1.txt
+++ b/docs/releases/3.1.1.txt
@@ -51,3 +51,7 @@ Bugfixes
 
 * Fixed detecting an async ``get_response`` callable in various builtin
   middlewares (:ticket:`31928`).
+
+* Fixed a ``QuerySet.order_by()`` crash on PostgreSQL when ordering and
+  grouping by :class:`~django.db.models.JSONField` with a custom
+  :attr:`~django.db.models.JSONField.decoder` (:ticket:`31956`).
-- 
cgit v1.3