Browse files

Fixed #17415 -- Reset database sequence for Site's pk after creating …

…the default site with an explicit pk. Thanks niko AT neagee net for the report, Russell and Karen for describing the fix, and Anssi for drafting the patch.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
aaugustin committed Jan 7, 2012
1 parent 33f839b commit 4629668ffacddb0b8ddb5d8cc7fb8d01f039a4e3
Showing with 22 additions and 4 deletions.
  1. +16 −4 django/contrib/sites/
  2. +6 −0 django/contrib/sites/
@@ -3,22 +3,34 @@
from django.db.models import signals
from django.db import connections
from django.db import router
from django.contrib.sites.models import Site
from django.contrib.sites import models as site_app
from import no_style
def create_default_site(app, created_models, verbosity, db, **kwargs):
# Only create the default sites in databases where Django created the table
if Site in created_models and router.allow_syncdb(db, Site) :
if verbosity >= 2:
print "Creating Site object"
# The default settings set SITE_ID = 1, and some tests in Django's test
# suite rely on this value. However, if database sequences are reused
# (e.g. in the test suite after flush/syncdb), it isn't guaranteed that
# the next id will be 1, so we coerce it. See #15573 and #16353. This
# can also crop up outside of tests - see #15346.
s = Site(pk=1, domain="", name="")
if verbosity >= 2:
print "Creating Site object"
Site(pk=1, domain="", name="").save(using=db)
# 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])
if sequence_sql:
if verbosity >= 2:
print "Resetting sequence"
cursor = connections[db].cursor()
for command in sequence_sql:
signals.post_syncdb.connect(create_default_site, sender=site_app)
@@ -15,6 +15,12 @@ def setUp(self):
def tearDown(self):
Site._meta.installed = self.old_Site_meta_installed
def test_save_another(self):
# Regression for #17415
# On some backends the sequence needs reset after save with explicit ID.
# Test that there is no sequence collisions by saving another site.
Site(domain="", name="").save()
def test_site_manager(self):
# Make sure that get_current() does not return a deleted Site object.
s = Site.objects.get_current()

0 comments on commit 4629668

Please sign in to comment.