summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-08-22 09:47:17 -0400
committerTim Graham <timograham@gmail.com>2013-08-22 09:47:17 -0400
commit768bbf3efe0c412bced1e865e90139a0f07dc613 (patch)
treea0c6d193fccf35a48ac81557a6cc6e56d582da28
parent2e926b041c36d46d921acba516a262e21ddaa60d (diff)
Revert "Fixed #20956 -- Removed useless check in django.db.utils"
This reverts commit ce0e86cf761dc182ae6fb8c0d68964955d19ec75. The check is necessary if 'ENGINE' is an empty string. Thanks apollo13 for pointing this out.
-rw-r--r--django/db/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/utils.py b/django/db/utils.py
index 8dbfc117a5..a1a2c0b564 100644
--- a/django/db/utils.py
+++ b/django/db/utils.py
@@ -173,7 +173,7 @@ class ConnectionHandler(object):
conn.setdefault('AUTOCOMMIT', False)
conn.setdefault('AUTOCOMMIT', True)
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.setdefault('CONN_MAX_AGE', 0)
conn.setdefault('OPTIONS', {})