Kaydet (Commit) d027993e authored tarafından Aymeric Augustin's avatar Aymeric Augustin Kaydeden (comit) Tim Graham

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

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

Backport of a73c8540 from master
üst 30e5356c
...@@ -146,10 +146,7 @@ class DatabaseWrapper(BaseDatabaseWrapper): ...@@ -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']:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment