Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.3.X] Refs #15573, #15850: Added a check for whether the sites app is installed when creating the test database, in order to work around a bug in get_model. Thanks to adsva and carljm.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ian Kelly 2011-04-21 17:43:22 +00:00
parent 64995cdd63
commit 53678ef508
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/db/backends/creation.py
View File

@ -379,9 +379,10 @@ class BaseDatabaseCreation(object):
# default site may or may not be 1, depending on how the sequence was # default site may or may not be 1, depending on how the sequence was
# reset. If the sites app is loaded, then we coerce it. # reset. If the sites app is loaded, then we coerce it.
from django.db.models import get_model from django.db.models import get_model
Site = get_model('sites', 'Site') if 'django.contrib.sites' in settings.INSTALLED_APPS:
if Site is not None and Site.objects.using(self.connection.alias).count() == 1: Site = get_model('sites', 'Site')
Site.objects.using(self.connection.alias).update(id=settings.SITE_ID) if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
Site.objects.using(self.connection.alias).update(id=settings.SITE_ID)
from django.core.cache import get_cache from django.core.cache import get_cache
from django.core.cache.backends.db import BaseDatabaseCache from django.core.cache.backends.db import BaseDatabaseCache