From 1431bcc70ec46de34080ad0f44c64740e1520704 Mon Sep 17 00:00:00 2001
From: Ramiro Morales <cramm0@gmail.com>
Date: Sun, 7 Nov 2010 21:02:49 +0000
Subject: [PATCH] [1.2.X] Fixed some Oracle backend test DB creation code bugs.

Made saving of modified settings compatible with multi-db, removed dead and superfluous code.

Backport of [14489] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14490 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/db/backends/oracle/creation.py | 42 ++++-----------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py
index d06ea223ca..940af15d06 100644
--- a/django/db/backends/oracle/creation.py
+++ b/django/db/backends/oracle/creation.py
@@ -1,5 +1,4 @@
 import sys, time
-from django.core import management
 from django.db.backends.creation import BaseDatabaseCreation
 
 TEST_DATABASE_PREFIX = 'test_'
@@ -39,7 +38,9 @@ class DatabaseCreation(BaseDatabaseCreation):
         'URLField':                     'VARCHAR2(%(max_length)s)',
     }
 
-    remember = {}
+    def __init__(self, connection):
+        self.remember = {}
+        super(DatabaseCreation, self).__init__(connection)
 
     def _create_test_db(self, verbosity=1, autoclobber=False):
         TEST_NAME = self._test_database_name()
@@ -135,9 +136,6 @@ class DatabaseCreation(BaseDatabaseCreation):
             'tblspace_temp': TEST_TBLSPACE_TMP,
         }
 
-        self.remember['user'] = self.connection.settings_dict['USER']
-        self.remember['passwd'] = self.connection.settings_dict['PASSWORD']
-
         cursor = self.connection.cursor()
         time.sleep(1) # To avoid "database is being accessed by other users" errors.
         if self._test_user_create():
@@ -214,35 +212,13 @@ class DatabaseCreation(BaseDatabaseCreation):
                 name = self.connection.settings_dict['TEST_NAME']
         except AttributeError:
             pass
-        except:
-            raise
         return name
 
     def _test_database_create(self):
-        name = True
-        try:
-            if self.connection.settings_dict['TEST_CREATE']:
-                name = True
-            else:
-                name = False
-        except KeyError:
-            pass
-        except:
-            raise
-        return name
+        return self.connection.settings_dict.get('TEST_CREATE', True)
 
     def _test_user_create(self):
-        name = True
-        try:
-            if self.connection.settings_dict['TEST_USER_CREATE']:
-                name = True
-            else:
-                name = False
-        except KeyError:
-            pass
-        except:
-            raise
-        return name
+        return self.connection.settings_dict.get('TEST_USER_CREATE', True)
 
     def _test_database_user(self):
         name = TEST_DATABASE_PREFIX + self.connection.settings_dict['USER']
@@ -251,8 +227,6 @@ class DatabaseCreation(BaseDatabaseCreation):
                 name = self.connection.settings_dict['TEST_USER']
         except KeyError:
             pass
-        except:
-            raise
         return name
 
     def _test_database_passwd(self):
@@ -262,8 +236,6 @@ class DatabaseCreation(BaseDatabaseCreation):
                 name = self.connection.settings_dict['TEST_PASSWD']
         except KeyError:
             pass
-        except:
-            raise
         return name
 
     def _test_database_tblspace(self):
@@ -273,8 +245,6 @@ class DatabaseCreation(BaseDatabaseCreation):
                 name = self.connection.settings_dict['TEST_TBLSPACE']
         except KeyError:
             pass
-        except:
-            raise
         return name
 
     def _test_database_tblspace_tmp(self):
@@ -284,6 +254,4 @@ class DatabaseCreation(BaseDatabaseCreation):
                 name = self.connection.settings_dict['TEST_TBLSPACE_TMP']
         except KeyError:
             pass
-        except:
-            raise
         return name