diff options
author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-08-28 07:56:04 +0200 |
---|---|---|
committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-08-28 19:09:46 +0200 |
commit | 0be51d2226fce030ac9ca840535a524f41e9832c (patch) | |
tree | f169982fe9af369944ac3130c9a50c675929dc1f /django/db/backends/postgresql/base.py | |
parent | 22105391424cc56f29f153bb76d6a15246152674 (diff) | |
download | django-0be51d2226fce030ac9ca840535a524f41e9832c.tar.gz |
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.
Diffstat (limited to 'django/db/backends/postgresql/base.py')
-rw-r--r-- | django/db/backends/postgresql/base.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index ed911a91da..03c7a3c284 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -200,7 +200,10 @@ class DatabaseWrapper(BaseDatabaseWrapper): # Set the isolation level to the value from OPTIONS. if self.isolation_level != connection.isolation_level: connection.set_session(isolation_level=self.isolation_level) - + # Register dummy loads() to avoid a round trip from psycopg2's decode + # to json.dumps() to json.loads(), when using a custom decoder in + # JSONField. + psycopg2.extras.register_default_jsonb(conn_or_curs=connection, loads=lambda x: x) return connection def ensure_timezone(self): |