diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2005-09-19 01:23:03 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2005-09-19 01:23:03 +0000 |
| commit | e7982bb5b0f53203d627e5a3d4955f6e711f3fa3 (patch) | |
| tree | 19f2d6ba19acef726706f054b6d586f74ea5464a /django/core/db/backends/postgresql.py | |
| parent | 09bd9d3ef6f1b843a58859698c2d8587461d5de6 (diff) | |
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
Diffstat (limited to 'django/core/db/backends/postgresql.py')
| -rw-r--r-- | django/core/db/backends/postgresql.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/django/core/db/backends/postgresql.py b/django/core/db/backends/postgresql.py index 150bc3f888..c623a5eed4 100644 --- a/django/core/db/backends/postgresql.py +++ b/django/core/db/backends/postgresql.py @@ -17,10 +17,12 @@ 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: - if DATABASE_NAME == '' or DATABASE_USER == '': + if DATABASE_NAME == '': 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) + raise ImproperlyConfigured, "You need to specify DATABASE_NAME in your Django settings file." + conn_string = "dbname=%s" % DATABASE_NAME + if DATABASE_USER: + conn_string = "user=%s %s" % (DATABASE_USER, conn_string) if DATABASE_PASSWORD: conn_string += " password=%s" % DATABASE_PASSWORD if DATABASE_HOST: |