diff options
| author | Anssi Kääriäinen <akaariai@gmail.com> | 2012-11-26 22:45:21 +0200 |
|---|---|---|
| committer | Anssi Kääriäinen <akaariai@gmail.com> | 2012-11-27 19:47:20 +0200 |
| commit | 905ea9619b871ded3204b1d0deb7e6fb9b081679 (patch) | |
| tree | 1d407ac7d9b80adc9325e747c92af76a93e26728 | |
| parent | 1893467784deb6cd8a493997e8bac933cc2e4af9 (diff) | |
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.
| -rw-r--r-- | django/db/backends/creation.py | 1 | ||||
| -rw-r--r-- | 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 4c4cf4d044..2baed62855 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 d9bf3dfea2..1cc3957232 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'] |