innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Added helpful error message if DATABASE_NAME or DATABASE_USER is blank for postgresql 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-16 22:21:50 +00:00
parent b9ec05d4c0
commit 1e0fb3b7a3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/db/backends/postgresql.py
View File

@ -17,7 +17,9 @@ class DatabaseWrapper:
def cursor(self): def cursor(self):
from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PASSWORD, DEBUG, TIME_ZONE from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PASSWORD, DEBUG, TIME_ZONE
if self.connection is None: 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) conn_string = "user=%s dbname=%s" % (DATABASE_USER, DATABASE_NAME)
if DATABASE_PASSWORD: if DATABASE_PASSWORD:
conn_string += " password=%s" % DATABASE_PASSWORD conn_string += " password=%s" % DATABASE_PASSWORD