mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.8.x] Removed 'autocommit' options for the psycopg2 backend.

Browse Source 
It was documented as not having any effect since Django 1.6.

Backport of a73c8540a8 from master
This commit is contained in:
Aymeric Augustin
2015-02-14 17:31:53 +01:00
committed by Tim Graham
parent 30e5356c2e
commit d027993ed1
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/backends/postgresql_psycopg2/base.py
View File

@@ -146,10 +146,7 @@ class DatabaseWrapper(BaseDatabaseWrapper):
'database': settings_dict['NAME'] or 'postgres', 'database': settings_dict['NAME'] or 'postgres',
} }
conn_params.update(settings_dict['OPTIONS']) conn_params.update(settings_dict['OPTIONS'])
if 'autocommit' in conn_params: conn_params.pop('isolation_level', None)
del conn_params['autocommit']
if 'isolation_level' in conn_params:
del conn_params['isolation_level']
if settings_dict['USER']: if settings_dict['USER']:
conn_params['user'] = settings_dict['USER'] conn_params['user'] = settings_dict['USER']
if settings_dict['PASSWORD']: if settings_dict['PASSWORD']: