diff options
| author | Benjy Weinberger <benjyw@gmail.com> | 2018-12-16 10:09:08 -0800 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-01-09 10:58:37 -0500 |
| commit | 222caab68a2a7345043d0c50161203cb2cfe70eb (patch) | |
| tree | 72d7f70c4945c8c76b30d7e772422e64efc894d3 | |
| parent | c2c85663e2dd06c9ed9c9ec2d02202d6d668d7f0 (diff) | |
Fixed #30071 -- Fixed error message when a 'default' database isn't provided.
| -rw-r--r-- | django/db/utils.py | 5 | ||||
| -rw-r--r-- | tests/db_utils/tests.py | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/django/db/utils.py b/django/db/utils.py index 6202a9a4aa..cb7f3d0f0b 100644 --- a/django/db/utils.py +++ b/django/db/utils.py @@ -151,11 +151,10 @@ class ConnectionHandler: '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] == {}: 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 def ensure_defaults(self, alias): diff --git a/tests/db_utils/tests.py b/tests/db_utils/tests.py index a6cfb43667..db58b58f33 100644 --- a/tests/db_utils/tests.py +++ b/tests/db_utils/tests.py @@ -31,6 +31,13 @@ class ConnectionHandlerTests(SimpleTestCase): with self.assertRaisesMessage(ImproperlyConfigured, msg): 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): |