Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
  • Loading branch information...
commit 3c0ee70e7c6b9e40cef611061f7756c80691ee76 1 parent ce07953
@adrianholovaty adrianholovaty authored
Showing with 6 additions and 2 deletions.
  1. +6 −2 django/core/db/backends/postgresql.py
View
8 django/core/db/backends/postgresql.py
@@ -18,8 +18,12 @@ def cursor(self):
from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PASSWORD, DEBUG, TIME_ZONE
if self.connection is None:
# Note that "host=" has to be last, because it might be blank.
- self.connection = Database.connect("user=%s dbname=%s password=%s host=%s" % \
- (DATABASE_USER, DATABASE_NAME, DATABASE_PASSWORD, DATABASE_HOST))
+ conn_string = "user=%s dbname=%s" % (DATABASE_USER, DATABASE_NAME)
+ 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
cursor = self.connection.cursor()
cursor.execute("SET TIME ZONE %s", [TIME_ZONE])
Please sign in to comment.
Something went wrong with that request. Please try again.