mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

[1.2.X] Fixed some Oracle backend test DB creation code bugs.

Browse Source 
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
This commit is contained in:
Ramiro Morales 2010-11-07 21:02:49 +00:00
parent 7509bdf86b
commit 1431bcc70e
1 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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