Added {{{ContentType.objects.clear_cache()}}} which clears the lookup cache. This needs to be called at syncdb time to avoid "stale" content-type IDs after the database gets flushed during unit tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4703 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 11 insertions, 0 deletions

diff --git a/django/contrib/contenttypes/management.py b/django/contrib/contenttypes/management.py
index f492f54303..3572d93049 100644
--- a/django/contrib/contenttypes/management.py
+++ b/django/contrib/contenttypes/management.py
@@ -7,6 +7,7 @@ from django.db.models import get_apps, get_models, signals
 
 def create_contenttypes(app, created_models, verbosity=2):
     from django.contrib.contenttypes.models import ContentType
+    ContentType.objects.clear_cache()
     app_models = get_models(app)
     if not app_models:
         return
diff --git a/django/contrib/contenttypes/models.py b/django/contrib/contenttypes/models.py
index 3384134cb2..0a5e68f37e 100644
--- a/django/contrib/contenttypes/models.py
+++ b/django/contrib/contenttypes/models.py
@@ -19,6 +19,16 @@ class ContentTypeManager(models.Manager):
                 model=key[1], defaults={'name': str(opts.verbose_name)})
             CONTENT_TYPE_CACHE[key] = ct
         return ct
+        
+    def clear_cache(self):
+        """
+        Clear out the content-type cache. This needs to happen during database
+        flushes to prevent caching of "stale" content type IDs (see
+        django.contrib.contenttypes.management.create_contenttypes for where
+        this gets called).
+        """
+        global CONTENT_TYPE_CACHE
+        CONTENT_TYPE_CACHE = {}
 
 class ContentType(models.Model):
     name = models.CharField(maxlength=100)