p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed db/backends/postgresql.py to add the password and host params only if they're not blank 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-07-13 20:59:56 +00:00
parent ce079538c6
commit 3c0ee70e7c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,8 +18,12 @@ class DatabaseWrapper:
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. # Note that "host=" has to be last, because it might be blank.
self.connection = Database.connect("user=%s dbname=%s password=%s host=%s" % \ conn_string = "user=%s dbname=%s" % (DATABASE_USER, DATABASE_NAME)
(DATABASE_USER, DATABASE_NAME, DATABASE_PASSWORD, DATABASE_HOST)) if DATABASE_PASSWORD:
conn_string += " password=%s" % DATABASE_PASSWORD
if DATABASE_HOST:
conn_string += " host=%s" % DATABASE_HOST
self.connection = Database.connect(conn_string)
self.connection.set_isolation_level(1) # make transactions transparent to all cursors self.connection.set_isolation_level(1) # make transactions transparent to all cursors
cursor = self.connection.cursor() cursor = self.connection.cursor()
cursor.execute("SET TIME ZONE %s", [TIME_ZONE]) cursor.execute("SET TIME ZONE %s", [TIME_ZONE])