Skip to content

[pull] main from django:main #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 17, 2025
+17 −27
Merged

[pull] main from django:main #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 17 additions & 27 deletions django/contrib/contenttypes/management/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,20 +89,6 @@ def inject_rename_contenttypes_operations(
migration.operations.insert(inserted + index, operation)


def get_contenttypes_and_models(app_config, using, ContentType):
if not router.allow_migrate_model(using, ContentType):
return None, None

ContentType.objects.clear_cache()

content_types = {
ct.model: ct
for ct in ContentType.objects.using(using).filter(app_label=app_config.label)
}
app_models = {model._meta.model_name: model for model in app_config.get_models()}
return content_types, app_models


def create_contenttypes(
app_config,
verbosity=2,
Expand All @@ -117,29 +103,33 @@ def create_contenttypes(
if not app_config.models_module:
return

app_label = app_config.label
try:
app_config = apps.get_app_config(app_label)
app_config = apps.get_app_config(app_config.label)
ContentType = apps.get_model("contenttypes", "ContentType")
except LookupError:
return

content_types, app_models = get_contenttypes_and_models(
app_config, using, ContentType
)
if not router.allow_migrate_model(using, ContentType):
return

if not app_models:
all_model_names = {model._meta.model_name for model in app_config.get_models()}

if not all_model_names:
return

ContentType.objects.clear_cache()

existing_model_names = set(
ContentType.objects.using(using)
.filter(app_label=app_config.label)
.values_list("model", flat=True)
)

cts = [
ContentType(
app_label=app_label,
model=model_name,
)
for (model_name, model) in app_models.items()
if model_name not in content_types
ContentType(app_label=app_config.label, model=model_name)
for model_name in sorted(all_model_names - existing_model_names)
]
ContentType.objects.using(using).bulk_create(cts)
if verbosity >= 2:
for ct in cts:
print("Adding content type '%s | %s'" % (ct.app_label, ct.model))
print(f"Adding content type '{ct.app_label} | {ct.model}'")
Loading