From ff60c5f9de3e8690d1e86f3e9e3f7248a15397c8 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 22 Dec 2009 15:18:51 +0000 Subject: Fixed #1142 -- Added multiple database support. This monster of a patch is the result of Alex Gaynor's 2009 Google Summer of Code project. Congratulations to Alex for a job well done. Big thanks also go to: * Justin Bronn for keeping GIS in line with the changes, * Karen Tracey and Jani Tiainen for their help testing Oracle support * Brett Hoerner, Jon Loyens, and Craig Kimmerer for their feedback. * Malcolm Treddinick for his guidance during the GSoC submission process. * Simon Willison for driving the original design process * Cal Henderson for complaining about ponies he wanted. ... and everyone else too numerous to mention that helped to bring this feature into fruition. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11952 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/modeltests/basic/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/modeltests/basic') diff --git a/tests/modeltests/basic/models.py b/tests/modeltests/basic/models.py index 34bfc6a83e..c86cb3ab25 100644 --- a/tests/modeltests/basic/models.py +++ b/tests/modeltests/basic/models.py @@ -16,7 +16,7 @@ try: except NameError: from django.utils.itercompat import sorted -from django.db import models +from django.db import models, DEFAULT_DB_ALIAS class Article(models.Model): headline = models.CharField(max_length=100, default='Default headline') @@ -373,7 +373,7 @@ from django.conf import settings building_docs = getattr(settings, 'BUILDING_DOCS', False) -if building_docs or settings.DATABASE_ENGINE == 'postgresql': +if building_docs or settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] == 'django.db.backends.postgresql': __test__['API_TESTS'] += """ # In PostgreSQL, microsecond-level precision is available. >>> a9 = Article(headline='Article 9', pub_date=datetime(2005, 7, 31, 12, 30, 45, 180)) @@ -382,7 +382,7 @@ if building_docs or settings.DATABASE_ENGINE == 'postgresql': datetime.datetime(2005, 7, 31, 12, 30, 45, 180) """ -if building_docs or settings.DATABASE_ENGINE == 'mysql': +if building_docs or settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] == 'django.db.backends.mysql': __test__['API_TESTS'] += """ # In MySQL, microsecond-level precision isn't available. You'll lose # microsecond-level precision once the data is saved. -- cgit v1.3