Ticket #16478: 16478.diff

docs/ref/settings.txt

@@ -590 +590 @@
 This is an Oracle-specific setting.
 
 The username to use when connecting to the Oracle database that will be used
-when running tests.
+when running tests. If not provided, Django will use ``'test_' + USER``.
 
+.. setting:: TEST_PASSWD
+
+TEST_PASSWD
+~~~~~~~~~~~
+
+Default: ``None``
+
+This is an Oracle-specific setting.
+
+The password to use when connecting to the Oracle database that will be used
+when running tests. If not provided, Django will use a hardcoded default value.
+
+.. setting:: TEST_TBLSPACE
+
+TEST_TBLSPACE
+~~~~~~~~~~~~~
+
+Default: ``None``
+
+This is an Oracle-specific setting.
+
+The name of the tablespace that will be used when running tests. If not
+provided, Django will use ``'test_' + NAME``.
+
+.. setting:: TEST_TBLSPACE_FILE
+
+TEST_TBLSPACE_FILE
+~~~~~~~~~~~~~~~~~~
+
+Default: ``None``
+
+This is an Oracle-specific setting.
+
+The location of the file that will store the tablespace that will be used when
+running tests. If not provided, Django will use ``TEST_TBLSPACE + '.dbf'``.
+
+.. setting:: TEST_TBLSPACE_TMP
+
+TEST_TBLSPACE_TMP
+~~~~~~~~~~~~~~~~~
+
+Default: ``None``
+
+This is an Oracle-specific setting.
+
+The name of the temporary tablespace that will be used when running tests. If
+not provided, Django will use ``'test_' + NAME + '_temp'``.
+
+.. setting:: TEST_TBLSPACE_TMP_FILE
+
+TEST_TBLSPACE_TMP_FILE
+~~~~~~~~~~~~~~~~~~~~~~
+
+Default: ``None``
+
+This is an Oracle-specific setting.
+
+The location of the file that will store the temporary tablespace that will be
+used when running tests. If not provided, Django will use ``TEST_TBLSPACE_TMP +
+'.dbf'``.
+
 .. setting:: DATABASE_ROUTERS
 
 DATABASE_ROUTERS

django/db/backends/oracle/creation.py

@@ -49 +49 @@
         TEST_USER = self._test_database_user()
         TEST_PASSWD = self._test_database_passwd()
         TEST_TBLSPACE = self._test_database_tblspace()
+        TEST_TBLSPACE_FILE = self._test_database_tblspace_file()
         TEST_TBLSPACE_TMP = self._test_database_tblspace_tmp()
+        TEST_TBLSPACE_TMP_FILE = self._test_database_tblspace_tmp_file()
 
         parameters = {
             'dbname': TEST_NAME,
             'user': TEST_USER,
             'password': TEST_PASSWD,
             'tblspace': TEST_TBLSPACE,
+            'tblspace_file': TEST_TBLSPACE_FILE,
             'tblspace_temp': TEST_TBLSPACE_TMP,
+            'tblspace_temp_file': TEST_TBLSPACE_TMP_FILE,
         }
 
         self.remember['user'] = self.connection.settings_dict['USER']
@@ -151 +155 @@
             print "_create_test_db(): dbname = %s" % parameters['dbname']
         statements = [
             """CREATE TABLESPACE %(tblspace)s
-               DATAFILE '%(tblspace)s.dbf' SIZE 20M
+               DATAFILE '%(tblspace_file)s' SIZE 20M
                REUSE AUTOEXTEND ON NEXT 10M MAXSIZE 200M
             """,
             """CREATE TEMPORARY TABLESPACE %(tblspace_temp)s
-               TEMPFILE '%(tblspace_temp)s.dbf' SIZE 20M
+               TEMPFILE '%(tblspace_temp_file)s' SIZE 20M
                REUSE AUTOEXTEND ON NEXT 10M MAXSIZE 100M
             """,
         ]
@@ -245 +249 @@
             pass
         return name
 
+    def _test_database_tblspace_file(self):
+        name = self._test_database_tblspace() + '.dbf'
+        try:
+            if self.connection.settings_dict['TEST_TBLSPACE_FILE']:
+                name = self.connection.settings_dict['TEST_TBLSPACE_FILE']
+        except KeyError:
+            pass
+        return name
+
     def _test_database_tblspace_tmp(self):
         name = TEST_DATABASE_PREFIX + self.connection.settings_dict['NAME'] + '_temp'
         try:
@@ -254 +267 @@
             pass
         return name
 
+    def _test_database_tblspace_tmp_file(self):
+        name = self._test_database_tblspace_tmp() + '.dbf'
+        try:
+            if self.connection.settings_dict['TEST_TBLSPACE_TMP_FILE']:
+                name = self.connection.settings_dict['TEST_TBLSPACE_TMP_FILE']
+        except KeyError:
+            pass
+        return name
+
     def _get_test_db_name(self):
         """
         We need to return the 'production' DB name to get the test DB creation