Ticket #618: database_port.patch

django/conf/project_template/settings/main.py

@@ -15 +15 @@
 DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
+DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
 
 SITE_ID = 1
 

django/conf/global_settings.py

@@ -50 +50 @@
 DATABASE_USER = ''
 DATABASE_PASSWORD = ''
 DATABASE_HOST = ''             # Set to empty string for localhost
+DATABASE_PORT = ''             # Set to empty string for default
 
 # Host for sending e-mail.
 EMAIL_HOST = 'localhost'

django/core/db/backends/postgresql.py

@@ -15 +15 @@
         self.queries = []
 
     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_PORT, DATABASE_PASSWORD, DEBUG, TIME_ZONE
         if self.connection is None:
             if DATABASE_NAME == '':
                 from django.core.exceptions import ImproperlyConfigured
@@ -27 +27 @@
                 conn_string += " password=%s" % DATABASE_PASSWORD
             if DATABASE_HOST:
                 conn_string += " host=%s" % DATABASE_HOST
+            if DATABASE_PORT:
+                conn_string += " port=%s" % DATABASE_PORT
             self.connection = Database.connect(conn_string)
             self.connection.set_isolation_level(1) # make transactions transparent to all cursors
         cursor = self.connection.cursor()

django/core/db/backends/mysql.py

@@ -53 +53 @@
         self.queries = []
 
     def cursor(self):
-        from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PASSWORD, DEBUG
+        from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG
         if self.connection is None:
             self.connection = Database.connect(user=DATABASE_USER, db=DATABASE_NAME,
-                passwd=DATABASE_PASSWORD, host=DATABASE_HOST, conv=django_conversions)
+                passwd=DATABASE_PASSWORD, host=DATABASE_HOST, port=DATABASE_PORT, conv=django_conversions)
         if DEBUG:
             return base.CursorDebugWrapper(MysqlDebugWrapper(self.connection.cursor()), self)
         return self.connection.cursor()