Author: mtredinnick
Date: 2009-04-12 00:56:59 -0500 (Sun, 12 Apr 2009)
New Revision: 10548
Modified:
django/branches/releases/1.0.X/django/db/backends/oracle/creation.py
Log:
[1.0.X] Fixed #10716 -- Fixed a couple of typos in Oracle testing setup.
Thanks, canarix.
Backport of r10547 from trunk.
Modified: django/branches/releases/1.0.X/django/db/backends/oracle/creation.py
===================================================================
--- django/branches/releases/1.0.X/django/db/backends/oracle/creation.py
2009-04-12 05:55:29 UTC (rev 10547)
+++ django/branches/releases/1.0.X/django/db/backends/oracle/creation.py
2009-04-12 05:56:59 UTC (rev 10548)
@@ -56,6 +56,7 @@
'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP,
}
+ self.remember['name'] = settings.DATABASE_NAME
self.remember['user'] = settings.DATABASE_USER
self.remember['passwd'] = settings.DATABASE_PASSWORD
@@ -108,6 +109,7 @@
print "Tests cancelled."
sys.exit(1)
+ settings.DATABASE_NAME = TEST_DATABASE_NAME
settings.DATABASE_USER = TEST_DATABASE_USER
settings.DATABASE_PASSWORD = TEST_DATABASE_PASSWD
@@ -124,6 +126,7 @@
TEST_DATABASE_TBLSPACE = self._test_database_tblspace(settings)
TEST_DATABASE_TBLSPACE_TMP = self._test_database_tblspace_tmp(settings)
+ settings.DATABASE_NAME = self.remember['name']
settings.DATABASE_USER = self.remember['user']
settings.DATABASE_PASSWORD = self.remember['passwd']
@@ -135,6 +138,7 @@
'tblspace_temp': TEST_DATABASE_TBLSPACE_TMP,
}
+ self.remember['name'] = settings.DATABASE_NAME
self.remember['user'] = settings.DATABASE_USER
self.remember['passwd'] = settings.DATABASE_PASSWORD
@@ -244,8 +248,8 @@
raise
return name
- def _test_database_user(self, ettings):
- name = TEST_DATABASE_PREFIX + settings.DATABASE_NAME
+ def _test_database_user(self, settings):
+ name = TEST_DATABASE_PREFIX + settings.DATABASE_USER
try:
if settings.TEST_DATABASE_USER:
name = settings.TEST_DATABASE_USER
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
