Ticket #1051: 1051.diff

django/conf/project_template/settings.py

@@ -11 +11 @@
 
 DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
+DATABASE_SCHEMAS = ''          # Only used with postgresq to support multiple schemas
 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

@@ -83 +83 @@
         cursor = self.connection.cursor()
         if set_tz:
             cursor.execute("SET TIME ZONE %s", [settings.TIME_ZONE])
+        if settings.DATABASE_SCHEMAS:
+            cursor.execute("SET search_path TO %s;" % settings.DATABASE_SCHEMAS)
         cursor = UnicodeCursorWrapper(cursor, settings.DEFAULT_CHARSET)
         global postgres_version
         if not postgres_version:

django/db/backends/postgresql_psycopg2/base.py

@@ -52 +52 @@
         cursor.tzinfo_factory = None
         if set_tz:
             cursor.execute("SET TIME ZONE %s", [settings.TIME_ZONE])
+        if settings.DATABASE_SCHEMAS:
+            cursor.execute("SET search_path TO %s;" % settings.DATABASE_SCHEMAS)
         global postgres_version
         if not postgres_version:
             cursor.execute("SELECT version()")

docs/settings.txt

@@ -302 +302 @@
 
 The username to use when connecting to the database. Not used with SQLite.
 
+DATABASE_SCHEMAS
+----------------
+
+Default: ``''`` (Empty string)
+
+On databases supporting Schemas, like PostgreSQL, the search_path will be
+set to the value of this setting which is, by default, ``public``.
+
+Please, note that currently the only backend which schema support is PostgreSQL.
+
 DATE_FORMAT
 -----------