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

[1.7.x] Fixed #24000 -- Corrected contrib.sites default site creation in a multiple database setup.

Browse Source 
Backport of 89e2c60f4396241c667b7a1de37765b7c96d702f from master
This commit is contained in:
Tim Graham 2014-12-27 09:06:38 -05:00
parent 965a999ae5
commit a79012f6d8
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/contrib/sites/management.py
View File

@ -8,13 +8,13 @@ from django.db import DEFAULT_DB_ALIAS, connections, router
from django.db.models import signals
def create_default_site(app_config, verbosity=2, interactive=True, db=DEFAULT_DB_ALIAS, **kwargs):
def create_default_site(app_config, verbosity=2, interactive=True, using=DEFAULT_DB_ALIAS, **kwargs):
try:
Site = apps.get_model('sites', 'Site')
except LookupError:
return
if not router.allow_migrate(db, Site):
if not router.allow_migrate(using, Site):
return
if not Site.objects.exists():
@ -25,15 +25,15 @@ def create_default_site(app_config, verbosity=2, interactive=True, db=DEFAULT_DB
# can also crop up outside of tests - see #15346.
if verbosity >= 2:
print("Creating example.com Site object")
Site(pk=1, domain="example.com", name="example.com").save(using=db)
Site(pk=1, domain="example.com", name="example.com").save(using=using)
# We set an explicit pk instead of relying on auto-incrementation,
# so we need to reset the database sequence. See #17415.
sequence_sql = connections[db].ops.sequence_reset_sql(no_style(), [Site])
sequence_sql = connections[using].ops.sequence_reset_sql(no_style(), [Site])
if sequence_sql:
if verbosity >= 2:
print("Resetting sequence")
with connections[db].cursor() as cursor:
with connections[using].cursor() as cursor:
for command in sequence_sql:
cursor.execute(command)

4
django/contrib/sites/tests.py
View File

@ -111,8 +111,8 @@ class CreateDefaultSiteTests(TestCase):
old_routers = router.routers
router.routers = [JustOtherRouter()]
try:
create_default_site(self.app_config, db='default', verbosity=0)
create_default_site(self.app_config, db='other', verbosity=0)
create_default_site(self.app_config, using='default', verbosity=0)
create_default_site(self.app_config, using='other', verbosity=0)
self.assertFalse(Site.objects.using('default').exists())
self.assertTrue(Site.objects.using('other').exists())
finally:

3
docs/releases/1.7.2.txt
View File

@ -172,3 +172,6 @@ Bugfixes
(:ticket:`24054`).
* Added tablespace SQL to apps with migrations (:ticket:`24051`).
* Corrected ``contrib.sites`` default site creation in a multiple database
setup (:ticket:`24000`).