[soc2009/model-validation] Merget to trunk at r12009

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/model-validation@12014 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 11 insertions, 3 deletions

diff --git a/tests/modeltests/basic/models.py b/tests/modeltests/basic/models.py
index 2dbde58256..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')
@@ -211,6 +211,14 @@ True
 >>> Article.objects.get(id__exact=8) == Article.objects.get(id__exact=7)
 False
 
+# You can use 'in' to test for membership...
+>>> a8 in Article.objects.all()
+True
+
+# ... but there will often be more efficient ways if that is all you need:
+>>> Article.objects.filter(id=a8.id).exists()
+True
+
 # dates() returns a list of available dates of the given scope for the given field.
 >>> Article.objects.dates('pub_date', 'year')
 [datetime.datetime(2005, 1, 1, 0, 0)]
@@ -365,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))
@@ -374,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.