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

[multi-db] Changed name of optional named databases setting to

Browse Source 
OTHER_DATABASES.


git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jason Pellerin 2006-07-11 20:38:27 +00:00
parent 97d1f60d77
commit 49ce784805
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/conf/global_settings.py
View File

@ -98,7 +98,7 @@ DATABASE_HOST = '' # Set to empty string for localhost. Not used wit
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
# Optional named database connections in addition to the default.
DATABASES = {}
OTHER_DATABASES = {}
# Host for sending e-mail.
EMAIL_HOST = 'localhost'

10
tests/runtests.py
View File

@ -163,7 +163,7 @@ class TestRunner:
# replacing any named connections defined in settings. All connections
# will use the default DATABASE_ENGINE
self.old_database_name = settings.DATABASE_NAME
self.old_databases = settings.DATABASES
self.old_databases = settings.OTHER_DATABASES
if settings.DATABASE_ENGINE == 'sqlite3':
# If we're using SQLite, it's more convenient to test against an
@ -173,7 +173,7 @@ class TestRunner:
new_databases = {}
for db_name in TEST_DATABASES:
db_st = settings.DATABASES.setdefault(db_name, {})
db_st = settings.OTHER_DATABASES.setdefault(db_name, {})
engine = db_st.get('DATABASE_ENGINE', settings.DATABASE_ENGINE)
if engine == 'sqlite3':
db_st['DATABASE_NAME'] = self._tempfile()
@ -181,10 +181,10 @@ class TestRunner:
else:
db_st['DATABASE_NAME'] = db_name
new_databases[db_name] = db_st
settings.DATABASES = new_databases
settings.OTHER_DATABASES = new_databases
self.create_test_db(TEST_DATABASE_NAME, connection)
for name, info in settings.DATABASES.items():
for name, info in settings.OTHER_DATABASES.items():
cx = connections[name]
test_connection = self.create_test_db(info['DATABASE_NAME'],
cx.connection)
@ -205,7 +205,7 @@ class TestRunner:
from django.conf import settings
connection.close()
settings.DATABASE_NAME = self.old_database_name
settings.DATABASES = self.old_databases
settings.OTHER_DATABASES = self.old_databases
for db_name, cx in self.created_dbs:
settings = cx.settings
cx.close()