summaryrefslogtreecommitdiff
path: root/django/db/backends/postgresql/base.py
diff options
context:
space:
mode:
authorNick Pope <nick.pope@flightdataservices.com>2017-12-11 12:08:45 +0000
committerTim Graham <timograham@gmail.com>2017-12-11 07:08:45 -0500
commitd13a9e44ded4e93570c6ba42ec84e45ddca2505b (patch)
tree0df16e6538d8794c39bd62b5a46879b8abe6572c /django/db/backends/postgresql/base.py
parenta9e5ac823df8ba8b786b6450c967ca378c008d0e (diff)
downloaddjango-d13a9e44ded4e93570c6ba42ec84e45ddca2505b.tar.gz
Fixed #28909 -- Simplified code using tuple/list/set/dict unpacking.
Diffstat (limited to 'django/db/backends/postgresql/base.py')
-rw-r--r--django/db/backends/postgresql/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py
index fbe444988a..1982a8aedb 100644
--- a/django/db/backends/postgresql/base.py
+++ b/django/db/backends/postgresql/base.py
@@ -151,8 +151,8 @@ class DatabaseWrapper(BaseDatabaseWrapper):
"Please supply the NAME value.")
conn_params = {
'database': settings_dict['NAME'] or 'postgres',
+ **settings_dict['OPTIONS'],
}
- conn_params.update(settings_dict['OPTIONS'])
conn_params.pop('isolation_level', None)
if settings_dict['USER']:
conn_params['user'] = settings_dict['USER']