Kaydet (Commit) 222caab6 authored tarafından Benjy Weinberger's avatar Benjy Weinberger Kaydeden (comit) Tim Graham

Fixed #30071 -- Fixed error message when a 'default' database isn't provided.

üst c2c85663
...@@ -151,11 +151,10 @@ class ConnectionHandler: ...@@ -151,11 +151,10 @@ class ConnectionHandler:
'ENGINE': 'django.db.backends.dummy', 'ENGINE': 'django.db.backends.dummy',
}, },
} }
if DEFAULT_DB_ALIAS not in self._databases:
raise ImproperlyConfigured("You must define a '%s' database." % DEFAULT_DB_ALIAS)
if self._databases[DEFAULT_DB_ALIAS] == {}: if self._databases[DEFAULT_DB_ALIAS] == {}:
self._databases[DEFAULT_DB_ALIAS]['ENGINE'] = 'django.db.backends.dummy' self._databases[DEFAULT_DB_ALIAS]['ENGINE'] = 'django.db.backends.dummy'
if DEFAULT_DB_ALIAS not in self._databases:
raise ImproperlyConfigured("You must define a '%s' database" % DEFAULT_DB_ALIAS)
return self._databases return self._databases
def ensure_defaults(self, alias): def ensure_defaults(self, alias):
......
...@@ -31,6 +31,13 @@ class ConnectionHandlerTests(SimpleTestCase): ...@@ -31,6 +31,13 @@ class ConnectionHandlerTests(SimpleTestCase):
with self.assertRaisesMessage(ImproperlyConfigured, msg): with self.assertRaisesMessage(ImproperlyConfigured, msg):
conns[DEFAULT_DB_ALIAS].ensure_connection() conns[DEFAULT_DB_ALIAS].ensure_connection()
def test_no_default_database(self):
DATABASES = {'other': {}}
conns = ConnectionHandler(DATABASES)
msg = "You must define a 'default' database."
with self.assertRaisesMessage(ImproperlyConfigured, msg):
conns['other'].ensure_connection()
class DatabaseErrorWrapperTests(TestCase): class DatabaseErrorWrapperTests(TestCase):
......
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