Ticket #1051: ticket_1051_rev6669.diff

django/conf/project_template/settings.py

@@ -11 +11 @@
 
 DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_SCHEMAS = ''          # Databse schemas to be used. Only used in PostgreSQL
 DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.

django/conf/global_settings.py

@@ -112 +112 @@
 # Database connection info.
 DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_SCHEMAS = ''          # Databse schemas to be used. Only used in PostgreSQL
 DATABASE_USER = ''             # Not used with sqlite3.
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.

django/db/backends/postgresql/base.py

@@ -81 +81 @@
 
     def _cursor(self, settings):
         set_tz = False
+        set_path = False
         if self.connection is None:
             set_tz = True
             if settings.DATABASE_NAME == '':
@@ -95 +96 @@
                 conn_string += " host=%s" % settings.DATABASE_HOST
             if settings.DATABASE_PORT:
                 conn_string += " port=%s" % settings.DATABASE_PORT
+            if settings.DATABASE_SCHEMAS:
+                set_path = True
             self.connection = Database.connect(conn_string, **self.options)
             self.connection.set_isolation_level(1) # make transactions transparent to all cursors
         cursor = self.connection.cursor()
         if set_tz:
             cursor.execute("SET TIME ZONE %s", [settings.TIME_ZONE])
+        if set_path:
+            cursor.execute("SET search_path TO %s" % ','.join(settings.DATABASE_SCHEMAS))
         cursor.execute("SET client_encoding to 'UNICODE'")
         cursor = UnicodeCursorWrapper(cursor, 'utf-8')
         return cursor

django/db/backends/postgresql_psycopg2/base.py

@@ -50 +50 @@
 
     def _cursor(self, settings):
         set_tz = False
+        set_path = False
         if self.connection is None:
             set_tz = True
             if settings.DATABASE_NAME == '':
@@ -64 +65 @@
                 conn_string += " host=%s" % settings.DATABASE_HOST
             if settings.DATABASE_PORT:
                 conn_string += " port=%s" % settings.DATABASE_PORT
+            if settings.DATABASE_SCHEMAS:
+                set_path = True
             self.connection = Database.connect(conn_string, **self.options)
             self.connection.set_isolation_level(1) # make transactions transparent to all cursors
             self.connection.set_client_encoding('UTF8')
@@ -71 +74 @@
         cursor.tzinfo_factory = None
         if set_tz:
             cursor.execute("SET TIME ZONE %s", [settings.TIME_ZONE])
+        if set_path:
+            cursor.execute("SET search_path TO %s" % ','.join(settings.DATABASE_SCHEMAS))
         return cursor

docs/settings.txt

@@ -322 +322 @@
 
 The username to use when connecting to the database. Not used with SQLite.
 
+DATABASE_SCHEMAS
+----------------
+
+Default: ``''`` (Empty string)
+
+On databases supporting schemas this is the schemas to be used.
+
+Note that currently the only backend with schema support is PostgreSQL.
+
 DATE_FORMAT
 -----------