From 6e742dabc95b00ba896434293556adeb4dbaee8a Mon Sep 17 00:00:00 2001
From: Konstantin Alekseev <mail@kalekseev.com>
Date: Mon, 26 Apr 2021 15:19:13 +0300
Subject: Fixed #32687 -- Restored passing process’ environment to underlying
 tool in dbshell on PostgreSQL.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Regression in bbe6fbb8768e8fb1aecb96d51c049d7ceaf802d3.
---
 django/db/backends/postgresql/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'django/db/backends/postgresql')

diff --git a/django/db/backends/postgresql/client.py b/django/db/backends/postgresql/client.py
index 3effab65a8..0effcc44e6 100644
--- a/django/db/backends/postgresql/client.py
+++ b/django/db/backends/postgresql/client.py
@@ -51,7 +51,7 @@ class DatabaseClient(BaseDatabaseClient):
             env['PGSSLKEY'] = str(sslkey)
         if passfile:
             env['PGPASSFILE'] = str(passfile)
-        return args, env
+        return args, (env or None)
 
     def runshell(self, parameters):
         sigint_handler = signal.getsignal(signal.SIGINT)
-- 
cgit v1.3