p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #26936 -- Fixed stale ContentType deletion in apps without models.

This commit is contained in:
Pavel Rybintsev 2017-02-04 23:59:29 +02:00 committed by Tim Graham
parent ceca221b31
commit 874b1f2cac
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/contenttypes/management/commands/remove_stale_contenttypes.py
View File

@ -26,8 +26,6 @@ class Command(BaseCommand):
for app_config in apps.get_app_configs(): for app_config in apps.get_app_configs():
content_types, app_models = get_contenttypes_and_models(app_config, db, ContentType) content_types, app_models = get_contenttypes_and_models(app_config, db, ContentType)
if not app_models:
continue
to_remove = [ to_remove = [
ct for (model_name, ct) in content_types.items() ct for (model_name, ct) in content_types.items()
if model_name not in app_models if model_name not in app_models

13
tests/contenttypes_tests/test_management.py
View File

@ -4,13 +4,17 @@ from django.apps.registry import Apps, apps
from django.contrib.contenttypes import management as contenttypes_management from django.contrib.contenttypes import management as contenttypes_management
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.core.management import call_command from django.core.management import call_command
from django.test import TestCase from django.test import TestCase, modify_settings
from django.test.utils import captured_stdout from django.test.utils import captured_stdout
from .models import ModelWithNullFKToSite, Post from .models import ModelWithNullFKToSite, Post
@modify_settings(INSTALLED_APPS={'append': ['no_models']})
class UpdateContentTypesTests(TestCase): class UpdateContentTypesTests(TestCase):
# Speed up tests by avoiding retrieving ContentTypes for all test apps.
available_apps = ['contenttypes_tests', 'no_models', 'django.contrib.contenttypes']
def setUp(self): def setUp(self):
self.before_count = ContentType.objects.count() self.before_count = ContentType.objects.count()
self.content_type = ContentType.objects.create(app_label='contenttypes_tests', model='Fake') self.content_type = ContentType.objects.create(app_label='contenttypes_tests', model='Fake')
@ -63,3 +67,10 @@ class UpdateContentTypesTests(TestCase):
with self.assertNumQueries(0): with self.assertNumQueries(0):
contenttypes_management.create_contenttypes(self.app_config, interactive=False, verbosity=0, apps=apps) contenttypes_management.create_contenttypes(self.app_config, interactive=False, verbosity=0, apps=apps)
self.assertEqual(ContentType.objects.count(), self.before_count + 1) self.assertEqual(ContentType.objects.count(), self.before_count + 1)
def test_contenttypes_removed_in_apps_without_models(self):
ContentType.objects.create(app_label='no_models', model='Fake')
with mock.patch('builtins.input', return_value='yes'), captured_stdout() as stdout:
call_command('remove_stale_contenttypes', verbosity=2)
self.assertIn("Deleting stale content type 'no_models | Fake'", stdout.getvalue())
self.assertEqual(ContentType.objects.count(), self.before_count)