test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #491 -- Non-user connections are now supported for PostgreSQL. Thanks, jafo@tummy.com 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-09-19 01:23:03 +00:00
parent 09bd9d3ef6
commit e7982bb5b0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,10 +17,12 @@ 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:
if DATABASE_NAME == '' or DATABASE_USER == '': if DATABASE_NAME == '':
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured, "You need to specify both DATABASE_NAME and DATABASE_USER in your Django settings file." raise ImproperlyConfigured, "You need to specify DATABASE_NAME in your Django settings file."
conn_string = "user=%s dbname=%s" % (DATABASE_USER, DATABASE_NAME) conn_string = "dbname=%s" % DATABASE_NAME
if DATABASE_USER:
conn_string = "user=%s %s" % (DATABASE_USER, conn_string)
if DATABASE_PASSWORD: if DATABASE_PASSWORD:
conn_string += " password=%s" % DATABASE_PASSWORD conn_string += " password=%s" % DATABASE_PASSWORD
if DATABASE_HOST: if DATABASE_HOST: