Django

Code

Changeset 647

Show
Ignore:
Timestamp:
09/18/05 20:23:03 (3 years ago)
Author:
adrian
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/db/backends/postgresql.py

    r615 r647  
    1818        from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PASSWORD, DEBUG, TIME_ZONE 
    1919        if self.connection is None: 
    20             if DATABASE_NAME == '' or DATABASE_USER == '': 
     20            if DATABASE_NAME == '': 
    2121                from django.core.exceptions import ImproperlyConfigured 
    22                 raise ImproperlyConfigured, "You need to specify both DATABASE_NAME and DATABASE_USER in your Django settings file." 
    23             conn_string = "user=%s dbname=%s" % (DATABASE_USER, DATABASE_NAME) 
     22                raise ImproperlyConfigured, "You need to specify DATABASE_NAME in your Django settings file." 
     23            conn_string = "dbname=%s" % DATABASE_NAME 
     24            if DATABASE_USER: 
     25                conn_string = "user=%s %s" % (DATABASE_USER, conn_string) 
    2426            if DATABASE_PASSWORD: 
    2527                conn_string += " password=%s" % DATABASE_PASSWORD