Ticket #16828: 16828.diff

django/db/backends/creation.py

@@ -374 +374 @@
             verbosity=max(verbosity - 1, 0),
             interactive=False,
             database=self.connection.alias)
-        
+
         # One effect of calling syncdb followed by flush is that the id of the
         # 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.
         from django.db.models import get_model
+        from django.db import router
         if 'django.contrib.sites' in settings.INSTALLED_APPS:
             Site = get_model('sites', 'Site')
-            if Site is not None and Site.objects.using(self.connection.alias).count() == 1:
+            if (Site is not None
+                and router.allow_syncdb(self.connection.alias, Site)
+                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
@@ -389 +392 @@
         for cache_alias in settings.CACHES:
             cache = get_cache(cache_alias)
             if isinstance(cache, BaseDatabaseCache):
-                from django.db import router
                 if router.allow_syncdb(self.connection.alias, cache.cache_model_class):
                     call_command('createcachetable', cache._table, database=self.connection.alias)