Ticket #6064: 6064.diff

django/db/backends/ado_mssql/base.py

@@ -109 +109 @@
-            # TODO: Handle DATABASE_PORT.
-            conn_string = "PROVIDER=SQLOLEDB;DATA SOURCE=%s;UID=%s;PWD=%s;DATABASE=%s" % (settings.DATABASE_HOST, settings.DATABASE_USER, settings.DATABASE_PASSWORD, settings.DATABASE_NAME)
-            self.connection = Database.connect(conn_string)
-
+
+
+
+

django/db/backends/mysql_old/base.py

@@ -194 +194 @@
-                    self.connection.set_character_set('utf8')
-        else:
-            cursor = self.connection.cursor()
+        for init_query in settings.CONNECTION_INIT_SQL:
+            cursor.execute(init_query)
-        return cursor
-
-    def make_debug_cursor(self, cursor):

django/db/backends/postgresql/base.py

@@ -100 +100 @@
-        cursor = self.connection.cursor()
-        if set_tz:
-            cursor.execute("SET TIME ZONE %s", [settings.TIME_ZONE])
+        for init_query in settings.CONNECTION_INIT_SQL:
+            cursor.execute(init_query)
-        cursor.execute("SET client_encoding to 'UNICODE'")
-        cursor = UnicodeCursorWrapper(cursor, 'utf-8')
-        return cursor

django/db/backends/sqlite3/base.py

@@ -112 +112 @@
-            self.connection.create_function("django_extract", 2, _sqlite_extract)
-            self.connection.create_function("django_date_trunc", 2, _sqlite_date_trunc)
-            self.connection.create_function("regexp", 2, _sqlite_regexp)
-
+
+
+
+
-
-    def close(self):
-        from django.conf import settings

django/db/backends/mysql/base.py

@@ -181 +181 @@
-            kwargs.update(self.options)
-            self.connection = Database.connect(**kwargs)
-        cursor = self.connection.cursor()
+        for init_query in settings.CONNECTION_INIT_SQL:
+            cursor.execute(init_query)
-        return cursor
-
-    def _rollback(self):

django/db/backends/oracle/base.py

@@ -432 +432 @@
-        # Set oracle date to ansi date format.
-        cursor.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD'")
-        cursor.execute("ALTER SESSION SET NLS_TIMESTAMP_FORMAT = 'YYYY-MM-DD HH24:MI:SS.FF'")
+        for init_query in settings.CONNECTION_INIT_SQL:
+            cursor.execute(init_query)
-        return cursor
-
-class FormatStylePlaceholderCursor(Database.Cursor):

django/db/backends/postgresql_psycopg2/base.py

@@ -73 +73 @@
-        cursor.tzinfo_factory = None
-        if set_tz:
-            cursor.execute("SET TIME ZONE %s", [settings.TIME_ZONE])
+        for init_query in settings.CONNECTION_INIT_SQL:
+            cursor.execute(init_query)
-        return cursor

django/conf/global_settings.py

@@ -120 +120 @@
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-DATABASE_OPTIONS = {}          # Set to empty dictionary for default.
-
+# List of sql statements to be executed at the beginning of every database connection.
+CONNECTION_INIT_SQL = (
+    # 'SET search_path TO example1, example2',
+)
+
-# Host for sending e-mail.
-EMAIL_HOST = 'localhost'
-

docs/settings.txt

@@ -269 +269 @@
-The default number of seconds to cache a page when the caching middleware or
-``cache_page()`` decorator is used.
-
+CONNECTION_INIT_SQL
+-------------------
+
+Default: ``()`` (Empty tuple)
+
+A list of sql statements to be executed at the beginning of every database connection.
+
+For example, to set the database schema to 'django_application_schema' in postgresql, you
+could set:
+
+    CONNECTION_INIT_SQL = (
+        'SET search_path TO django_application_schema',
+    )
+
-DATABASE_ENGINE
----------------
-