p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed some breakages in the Oracle test database handling from r10026. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ian Kelly 2009-03-11 21:14:18 +00:00
parent 638dbc3e83
commit 90a3c34b35
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,8 +108,8 @@ class DatabaseCreation(BaseDatabaseCreation):
print "Tests cancelled." print "Tests cancelled."
sys.exit(1) sys.exit(1)
settings.DATABASE_USER = TEST_DATABASE_USER settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = TEST_DATABASE_USER
settings.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
@ -124,8 +124,8 @@ 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_USER = self.remember['user'] settings.DATABASE_USER = self.connection.settings_dict["DATABASE_USER"] = self.remember['user']
settings.DATABASE_PASSWORD = self.remember['passwd'] settings.DATABASE_PASSWORD = self.connection.settings_dict["DATABASE_PASSWORD"] = self.remember['passwd']
parameters = { parameters = {
'dbname': TEST_DATABASE_NAME, 'dbname': TEST_DATABASE_NAME,