From 905ea9619b871ded3204b1d0deb7e6fb9b081679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anssi=20K=C3=A4=C3=A4ri=C3=A4inen?= Date: Mon, 26 Nov 2012 22:45:21 +0200 Subject: [PATCH] Made sure global settings are changed in test db creation There was an assumption that changing connection.settings_dict changed also the settings.DATABASES values. This assumption is now gone. --- django/db/backends/creation.py | 1 + django/db/backends/oracle/creation.py | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py index 4c4cf4d044f..2baed62855c 100644 --- a/django/db/backends/creation.py +++ b/django/db/backends/creation.py @@ -281,6 +281,7 @@ class BaseDatabaseCreation(object): self._create_test_db(verbosity, autoclobber) self.connection.close() + settings.DATABASES[self.connection.alias]["NAME"] = test_database_name self.connection.settings_dict["NAME"] = test_database_name # Report syncdb messages at one level lower than that requested. diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py index d9bf3dfea2c..1cc3957232d 100644 --- a/django/db/backends/oracle/creation.py +++ b/django/db/backends/oracle/creation.py @@ -104,10 +104,12 @@ class DatabaseCreation(BaseDatabaseCreation): print("Tests cancelled.") sys.exit(1) - self.connection.settings_dict['SAVED_USER'] = self.connection.settings_dict['USER'] - self.connection.settings_dict['SAVED_PASSWORD'] = self.connection.settings_dict['PASSWORD'] - self.connection.settings_dict['TEST_USER'] = self.connection.settings_dict['USER'] = TEST_USER - self.connection.settings_dict['PASSWORD'] = TEST_PASSWD + from django.db import settings + 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_settings['PASSWORD'] = self.connection.settings_dict['PASSWORD'] = TEST_PASSWD return self.connection.settings_dict['NAME']