summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/core/db/backends/postgresql.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/core/db/backends/postgresql.py b/django/core/db/backends/postgresql.py
index cf7c152f67..8de25f0d57 100644
--- a/django/core/db/backends/postgresql.py
+++ b/django/core/db/backends/postgresql.py
@@ -17,7 +17,9 @@ class DatabaseWrapper:
def cursor(self):
from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PASSWORD, DEBUG, TIME_ZONE
if self.connection is None:
- # Note that "host=" has to be last, because it might be blank.
+ if DATABASE_NAME == '' or DATABASE_USER == '':
+ from django.core.exceptions import ImproperlyConfigured
+ raise ImproperlyConfigured, "You need to specify both DATABASE_NAME and DATABASE_USER in your Django settings file."
conn_string = "user=%s dbname=%s" % (DATABASE_USER, DATABASE_NAME)
if DATABASE_PASSWORD:
conn_string += " password=%s" % DATABASE_PASSWORD