Ticket #1051: postgresql_schemas_r11651.diff

django/db/__init__.py

@@ -50 +50 @@
 connection = backend.DatabaseWrapper({
     'DATABASE_HOST': settings.DATABASE_HOST,
     'DATABASE_NAME': settings.DATABASE_NAME,
+    'DATABASE_SCHEMAS': settings.DATABASE_SCHEMAS,
     'DATABASE_OPTIONS': settings.DATABASE_OPTIONS,
     'DATABASE_PASSWORD': settings.DATABASE_PASSWORD,
     'DATABASE_PORT': settings.DATABASE_PORT,

django/db/backends/postgresql/base.py

@@ -98 +98 @@
 
     def _cursor(self):
         set_tz = False
+        set_path = False
         settings_dict = self.settings_dict
         if self.connection is None:
             set_tz = True
@@ -113 +114 @@
                 conn_string += " host=%s" % settings_dict['DATABASE_HOST']
             if settings_dict['DATABASE_PORT']:
                 conn_string += " port=%s" % settings_dict['DATABASE_PORT']
+            if settings_dict['DATABASE_SCHEMAS']:
+                set_path = True
             self.connection = Database.connect(conn_string, **settings_dict['DATABASE_OPTIONS'])
             self.connection.set_isolation_level(1) # make transactions transparent to all cursors
             connection_created.send(sender=self.__class__)
@@ -124 +127 @@
             if self._version[0:2] < (8, 0):
                 # No savepoint support for earlier version of PostgreSQL.
                 self.features.uses_savepoints = False
+        if set_path:
+            cursor.execute("SET search_path TO %s" % ','.join(settings_dict['DATABASE_SCHEMAS'])) 
         cursor.execute("SET client_encoding to 'UNICODE'")
         cursor = UnicodeCursorWrapper(cursor, 'utf-8')
         return cursor

django/db/backends/postgresql_psycopg2/base.py

@@ -75 +75 @@
 
     def _cursor(self):
         set_tz = False
+        set_path = False
         settings_dict = self.settings_dict
         if self.connection is None:
             set_tz = True
@@ -95 +96 @@
                 conn_params['host'] = settings_dict['DATABASE_HOST']
             if settings_dict['DATABASE_PORT']:
                 conn_params['port'] = settings_dict['DATABASE_PORT']
+            if settings_dict['DATABASE_SCHEMAS']:
+                set_path = True
             self.connection = Database.connect(**conn_params)
             self.connection.set_client_encoding('UTF8')
             self.connection.set_isolation_level(self.isolation_level)
@@ -119 +122 @@
                     # versions that support it, but, right now, that's hard to
                     # do without breaking other things (#10509).
                     self.features.can_return_id_from_insert = True
+        if set_path:
+            cursor.execute("SET search_path TO %s" % ','.join(settings_dict['DATABASE_SCHEMAS']))                       
         return cursor
 
     def _enter_transaction_management(self, managed):

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

@@ -125 +125 @@
 # Database connection info.
 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.