p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #10716 so Oracle tests run again. Thanks very much, kmtracey. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Matt Boersma 2009-04-21 18:09:03 +00:00
parent bfe36750b1
commit b09f554175
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/db/backends/oracle/creation.py
View File

@ -56,7 +56,6 @@ class DatabaseCreation(BaseDatabaseCreation):
'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP, 'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP,
} }
self.remember['name'] = settings.DATABASE_NAME
self.remember['user'] = settings.DATABASE_USER self.remember['user'] = settings.DATABASE_USER
self.remember['passwd'] = settings.DATABASE_PASSWORD self.remember['passwd'] = settings.DATABASE_PASSWORD
@ -109,8 +108,7 @@ class DatabaseCreation(BaseDatabaseCreation):
print "Tests cancelled." print "Tests cancelled."
sys.exit(1) sys.exit(1)
settings.DATABASE_NAME = self.connection.settings_dict["DATABASE_NAME"] = TEST_DATABASE_NAME settings.TEST_DATABASE_USER = settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = TEST_DATABASE_USER
settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = TEST_DATABASE_USER
settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = TEST_DATABASE_PASSWD settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = TEST_DATABASE_PASSWD
return settings.DATABASE_NAME return settings.DATABASE_NAME
@ -126,7 +124,6 @@ class DatabaseCreation(BaseDatabaseCreation):
TEST_DATABASE_TBLSPACE = self._test_database_tblspace(settings) TEST_DATABASE_TBLSPACE = self._test_database_tblspace(settings)
TEST_DATABASE_TBLSPACE_TMP = self._test_database_tblspace_tmp(settings) TEST_DATABASE_TBLSPACE_TMP = self._test_database_tblspace_tmp(settings)
settings.DATABASE_NAME = self.connection.settings_dict["DATABASE_NAME"] = self.remember['name']
settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = self.remember['user'] settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = self.remember['user']
settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = self.remember['passwd'] settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = self.remember['passwd']
@ -138,7 +135,6 @@ class DatabaseCreation(BaseDatabaseCreation):
'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP, 'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP,
} }
self.remember['name'] = settings.DATABASE_NAME
self.remember['user'] = settings.DATABASE_USER self.remember['user'] = settings.DATABASE_USER
self.remember['passwd'] = settings.DATABASE_PASSWORD self.remember['passwd'] = settings.DATABASE_PASSWORD