test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Fixed #20956 -- Removed useless check in django.db.utils" 

This reverts commit ce0e86cf76.

The check is necessary if 'ENGINE' is an empty string.
Thanks apollo13 for pointing this out.
This commit is contained in:
Tim Graham 2013-08-22 09:47:17 -04:00
parent 2e926b041c
commit 768bbf3efe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/utils.py
View File

@ -173,7 +173,7 @@ class ConnectionHandler(object):
conn.setdefault('AUTOCOMMIT', False) conn.setdefault('AUTOCOMMIT', False)
conn.setdefault('AUTOCOMMIT', True) conn.setdefault('AUTOCOMMIT', True)
conn.setdefault('ENGINE', 'django.db.backends.dummy') conn.setdefault('ENGINE', 'django.db.backends.dummy')
if conn['ENGINE'] == 'django.db.backends.': if conn['ENGINE'] == 'django.db.backends.' or not conn['ENGINE']:
conn['ENGINE'] = 'django.db.backends.dummy' conn['ENGINE'] = 'django.db.backends.dummy'
conn.setdefault('CONN_MAX_AGE', 0) conn.setdefault('CONN_MAX_AGE', 0)
conn.setdefault('OPTIONS', {}) conn.setdefault('OPTIONS', {})