Commit 41afae4c authored by Shai Berger's avatar Shai Berger
Browse files

Reorganized the database test settings 

Change database test settings from "TEST_"-prefixed entries in the
database settings dictionary to setting in a dictionary that is itself
an entry "TEST" in the database settings.

Refs #21775

Thanks Josh Smeaton for review.
parent add1584b

django/db/backends/creation.py

+2 −2
Original line number Diff line number Diff line
@@ -391,8 +391,8 @@ class BaseDatabaseCreation(object): 
        _create_test_db() and when no external munging is done with the 'NAME'

        or 'TEST_NAME' settings.

        """

        if self.connection.settings_dict['TEST_NAME']:

            return self.connection.settings_dict['TEST_NAME']

        if self.connection.settings_dict['TEST']['NAME']:

            return self.connection.settings_dict['TEST']['NAME']

        return TEST_DATABASE_PREFIX + self.connection.settings_dict['NAME']



    def _create_test_db(self, verbosity, autoclobber):

django/db/backends/mysql/creation.py

+5 −4
Original line number Diff line number Diff line
@@ -34,10 +34,11 @@ class DatabaseCreation(BaseDatabaseCreation): 


    def sql_table_creation_suffix(self):

        suffix = []

        if self.connection.settings_dict['TEST_CHARSET']:

            suffix.append('CHARACTER SET %s' % self.connection.settings_dict['TEST_CHARSET'])

        if self.connection.settings_dict['TEST_COLLATION']:

            suffix.append('COLLATE %s' % self.connection.settings_dict['TEST_COLLATION'])

        test_settings = self.connection.settings_dict['TEST']

        if test_settings['CHARSET']:

            suffix.append('CHARACTER SET %s' % test_settings['CHARSET'])

        if test_settings['COLLATION']:

            suffix.append('COLLATE %s' % test_settings['COLLATION'])

        return ' '.join(suffix)



    def sql_for_inline_foreign_key_references(self, model, field, known_models, style):

django/db/backends/oracle/creation.py

+24 −38
Original line number Diff line number Diff line
@@ -119,7 +119,9 @@ class DatabaseCreation(BaseDatabaseCreation): 
        real_settings = settings.DATABASES[self.connection.alias]

        real_settings['SAVED_USER'] = self.connection.settings_dict['SAVED_USER'] = self.connection.settings_dict['USER']

        real_settings['SAVED_PASSWORD'] = self.connection.settings_dict['SAVED_PASSWORD'] = self.connection.settings_dict['PASSWORD']

        real_settings['TEST_USER'] = real_settings['USER'] = self.connection.settings_dict['TEST_USER'] = self.connection.settings_dict['USER'] = TEST_USER

        real_test_settings = real_settings['TEST']

        test_settings = self.connection.settings_dict['TEST']

        real_test_settings['USER'] = real_settings['USER'] = test_settings['USER'] = self.connection.settings_dict['USER'] = TEST_USER

        real_settings['PASSWORD'] = self.connection.settings_dict['PASSWORD'] = TEST_PASSWD



        return self.connection.settings_dict['NAME']
@@ -216,56 +218,40 @@ class DatabaseCreation(BaseDatabaseCreation): 
                sys.stderr.write("Failed (%s)\n" % (err))

                raise



    def _test_settings_get(self, key, default=None, prefixed=None):

        """

        Return a value from the test settings dict,

        or a given default,

        or a prefixed entry from the main settings dict

        """

        settings_dict = self.connection.settings_dict

        val = settings_dict['TEST'].get(key, default)

        if val is None:

            val = TEST_DATABASE_PREFIX + settings_dict[prefixed]

        return val



    def _test_database_name(self):

        name = TEST_DATABASE_PREFIX + self.connection.settings_dict['NAME']

        try:

            if self.connection.settings_dict['TEST_NAME']:

                name = self.connection.settings_dict['TEST_NAME']

        except AttributeError:

            pass

        return name

        return self._test_settings_get('NAME', prefixed='NAME')



    def _test_database_create(self):

        return self.connection.settings_dict.get('TEST_CREATE', True)

        return self._test_settings_get('CREATE_DB', default=True)



    def _test_user_create(self):

        return self.connection.settings_dict.get('TEST_USER_CREATE', True)

        return self._test_settings_get('CREATE_USER', default=True)



    def _test_database_user(self):

        name = TEST_DATABASE_PREFIX + self.connection.settings_dict['USER']

        try:

            if self.connection.settings_dict['TEST_USER']:

                name = self.connection.settings_dict['TEST_USER']

        except KeyError:

            pass

        return name

        return self._test_settings_get('USER', prefixed='USER')



    def _test_database_passwd(self):

        name = PASSWORD

        try:

            if self.connection.settings_dict['TEST_PASSWD']:

                name = self.connection.settings_dict['TEST_PASSWD']

        except KeyError:

            pass

        return name

        return self._test_settings_get('PASSWORD', default=PASSWORD)



    def _test_database_tblspace(self):

        name = TEST_DATABASE_PREFIX + self.connection.settings_dict['NAME']

        try:

            if self.connection.settings_dict['TEST_TBLSPACE']:

                name = self.connection.settings_dict['TEST_TBLSPACE']

        except KeyError:

            pass

        return name

        return self._test_settings_get('TBLSPACE', prefixed='NAME')



    def _test_database_tblspace_tmp(self):

        name = TEST_DATABASE_PREFIX + self.connection.settings_dict['NAME'] + '_temp'

        try:

            if self.connection.settings_dict['TEST_TBLSPACE_TMP']:

                name = self.connection.settings_dict['TEST_TBLSPACE_TMP']

        except KeyError:

            pass

        return name

        settings_dict = self.connection.settings_dict

        return settings_dict['TEST'].get('TBLSPACE_TMP',

                                         TEST_DATABASE_PREFIX + settings_dict['NAME'] + '_temp')



    def _get_test_db_name(self):

        """

django/db/backends/postgresql_psycopg2/creation.py

+4 −3
Original line number Diff line number Diff line
@@ -39,9 +39,10 @@ class DatabaseCreation(BaseDatabaseCreation): 
    }



    def sql_table_creation_suffix(self):

        assert self.connection.settings_dict['TEST_COLLATION'] is None, "PostgreSQL does not support collation setting at database creation time."

        if self.connection.settings_dict['TEST_CHARSET']:

            return "WITH ENCODING '%s'" % self.connection.settings_dict['TEST_CHARSET']

        test_settings = self.connection.settings_dict['TEST']

        assert test_settings['COLLATION'] is None, "PostgreSQL does not support collation setting at database creation time."

        if test_settings['CHARSET']:

            return "WITH ENCODING '%s'" % test_settings['CHARSET']

        return ''



    def sql_indexes_for_field(self, model, f, style):

django/db/backends/sqlite3/creation.py

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class DatabaseCreation(BaseDatabaseCreation): 
        return []



    def _get_test_db_name(self):

        test_database_name = self.connection.settings_dict['TEST_NAME']

        test_database_name = self.connection.settings_dict['TEST']['NAME']

        if test_database_name and test_database_name != ':memory:':

            return test_database_name

        return ':memory:'
@@ -83,7 +83,7 @@ class DatabaseCreation(BaseDatabaseCreation): 


        This takes into account the special cases of ":memory:" and "" for

        SQLite since the databases will be distinct despite having the same

        TEST_NAME. See http://www.sqlite.org/inmemorydb.html

        TEST NAME. See http://www.sqlite.org/inmemorydb.html

        """

        test_dbname = self._get_test_db_name()

        sig = [self.connection.settings_dict['NAME']]