Author: mboersma
Date: 2009-04-21 13:09:03 -0500 (Tue, 21 Apr 2009)
New Revision: 10608
Modified:
django/trunk/django/db/backends/oracle/creation.py
Log:
Fixed #10716 so Oracle tests run again. Thanks very much, kmtracey.
Modified: django/trunk/django/db/backends/oracle/creation.py
===================================================================
--- django/trunk/django/db/backends/oracle/creation.py 2009-04-21 17:56:54 UTC
(rev 10607)
+++ django/trunk/django/db/backends/oracle/creation.py 2009-04-21 18:09:03 UTC
(rev 10608)
@@ -56,7 +56,6 @@
'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP,
}
- self.remember['name'] = settings.DATABASE_NAME
self.remember['user'] = settings.DATABASE_USER
self.remember['passwd'] = settings.DATABASE_PASSWORD
@@ -109,8 +108,7 @@
print "Tests cancelled."
sys.exit(1)
- settings.DATABASE_NAME =
self.connection.settings_dict["DATABASE_NAME"] = TEST_DATABASE_NAME
- settings.DATABASE_USER =
self.connection.settings_dict["DATABASE_USER"] = TEST_DATABASE_USER
+ settings.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
return settings.DATABASE_NAME
@@ -126,7 +124,6 @@
TEST_DATABASE_TBLSPACE = self._test_database_tblspace(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_PASSWORD =
self.connection.settings_dict["DATABASE_PASSWORD"] = self.remember['passwd']
@@ -138,7 +135,6 @@
'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP,
}
- self.remember['name'] = settings.DATABASE_NAME
self.remember['user'] = settings.DATABASE_USER
self.remember['passwd'] = settings.DATABASE_PASSWORD
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
