Fix FieldCacheMixin.cache_name (#2562)

1. Move the allowlist entries from the Django 5.1 file to the main one, under the `@cached_property` heading. This was missed in 0a3cb4a.
2. Move the `@deprecated` decorator to `get_cache_name()`, which is what is actually deprecated, per django/django@b9838c6.

Author: adamchainz

django-stubs/db/models/fields/mixins.pyi

@@ -7,9 +7,9 @@ from typing_extensions import deprecated
 NOT_PROVIDED: Any
 
 class FieldCacheMixin:
+    @deprecated("get_cache_name() is deprecated and will be removed in Django 6.0. Use cache_name instead.")
     def get_cache_name(self) -> str: ...
     @cached_property
-    @deprecated("cache_name() is deprecated and will be removed in Django 6.0. Use get_cache_name() instead.")
     def cache_name(self) -> str: ...
     def get_cached_value(self, instance: Model, default: Any = ...) -> Model | None: ...
     def is_cached(self, instance: Model) -> bool: ...

scripts/stubtest/allowlist.txt

@@ -158,6 +158,7 @@ django.utils.functional.cached_property.name
 # Ignore @cached_property error "cannot reconcile @property on stub with runtime object"
 django.contrib.admin.helpers.Fieldset.is_collapsible
 django.contrib.admin.helpers.InlineAdminFormSet.is_collapsible
+django.contrib.contenttypes.fields.GenericForeignKey.cache_name
 django.contrib.contenttypes.fields.ReverseGenericManyToOneDescriptor.related_manager_cls
 django.contrib.gis.db.backends.base.operations.BaseSpatialOperations.select_extent
 django.contrib.gis.db.backends.mysql.features.DatabaseFeatures.django_test_skips
@@ -180,6 +181,7 @@ django.contrib.gis.db.models.ForeignObject.foreign_related_fields
 django.contrib.gis.db.models.ForeignObject.local_related_fields
 django.contrib.gis.db.models.ForeignObject.related_fields
 django.contrib.gis.db.models.ForeignObject.reverse_related_fields
+django.contrib.gis.db.models.ForeignObjectRel.cache_name
 django.contrib.gis.db.models.ForeignObjectRel.hidden
 django.contrib.gis.db.models.ForeignObjectRel.many_to_many
 django.contrib.gis.db.models.ForeignObjectRel.many_to_one
@@ -301,6 +303,7 @@ django.db.models.ForeignObject.foreign_related_fields
 django.db.models.ForeignObject.local_related_fields
 django.db.models.ForeignObject.related_fields
 django.db.models.ForeignObject.reverse_related_fields
+django.db.models.ForeignObjectRel.cache_name
 django.db.models.ForeignObjectRel.hidden
 django.db.models.ForeignObjectRel.many_to_many
 django.db.models.ForeignObjectRel.many_to_one
@@ -323,10 +326,12 @@ django.db.models.fields.Field.cached_col
 django.db.models.fields.Field.validators
 django.db.models.fields.IntegerField.validators
 django.db.models.fields.generated.GeneratedField.cached_col
+django.db.models.fields.mixins.FieldCacheMixin.cache_name
 django.db.models.fields.related.ForeignObject.foreign_related_fields
 django.db.models.fields.related.ForeignObject.local_related_fields
 django.db.models.fields.related.ForeignObject.related_fields
 django.db.models.fields.related.ForeignObject.reverse_related_fields
+django.db.models.fields.related.ForeignObjectRel.cache_name
 django.db.models.fields.related.ForeignObjectRel.hidden
 django.db.models.fields.related.ForeignObjectRel.many_to_many
 django.db.models.fields.related.ForeignObjectRel.many_to_one
@@ -336,13 +341,15 @@ django.db.models.fields.related.ForeignObjectRel.one_to_one
 django.db.models.fields.related.ForeignObjectRel.related_model
 django.db.models.fields.related.ForwardManyToOneDescriptor.RelatedObjectDoesNotExist
 django.db.models.fields.related.ManyToManyDescriptor.related_manager_cls
+django.db.models.fields.related.RelatedField.cache_name
 django.db.models.fields.related.RelatedField.related_model
 django.db.models.fields.related.ReverseManyToOneDescriptor.related_manager_cls
 django.db.models.fields.related.ReverseOneToOneDescriptor.RelatedObjectDoesNotExist
 django.db.models.fields.related_descriptors.ForwardManyToOneDescriptor.RelatedObjectDoesNotExist
 django.db.models.fields.related_descriptors.ManyToManyDescriptor.related_manager_cls
 django.db.models.fields.related_descriptors.ReverseManyToOneDescriptor.related_manager_cls
 django.db.models.fields.related_descriptors.ReverseOneToOneDescriptor.RelatedObjectDoesNotExist
+django.db.models.fields.reverse_related.ForeignObjectRel.cache_name
 django.db.models.fields.reverse_related.ForeignObjectRel.hidden
 django.db.models.fields.reverse_related.ForeignObjectRel.many_to_many
 django.db.models.fields.reverse_related.ForeignObjectRel.many_to_one

scripts/stubtest/allowlist_todo_django51.txt

@@ -3,12 +3,10 @@
 # Only discrepancies that appeared after Django 5.0 -> 5.1 update.
 # Unsorted: there are real problems and things we can really ignore:
 
-django.contrib.contenttypes.fields.GenericForeignKey.cache_name
 django.contrib.contenttypes.fields.GenericForeignKey.get_attname_column
 django.contrib.contenttypes.models.ContentType.get_object_for_this_type
 django.contrib.gis.db.backends.mysql.operations.MySQLOperations.collect
 django.contrib.gis.db.models.ForeignObjectRel.accessor_name
-django.contrib.gis.db.models.ForeignObjectRel.cache_name
 django.contrib.gis.db.models.OrderBy.constraint_validation_compatible
 django.contrib.gis.db.models.functions.FromWKB.__init__
 django.contrib.gis.db.models.functions.FromWKB.as_oracle
@@ -68,17 +66,12 @@ django.db.backends.sqlite3.operations.DatabaseOperations.force_group_by
 django.db.migrations.autodetector.MigrationAutodetector.generate_altered_index_together
 django.db.migrations.autodetector.OperationDependency
 django.db.models.ForeignObjectRel.accessor_name
-django.db.models.ForeignObjectRel.cache_name
 django.db.models.OrderBy.constraint_validation_compatible
 django.db.models.expressions.BaseExpression.constraint_validation_compatible
 django.db.models.expressions.BaseExpression.get_expression_for_validation
 django.db.models.expressions.OrderBy.constraint_validation_compatible
-django.db.models.fields.mixins.FieldCacheMixin.cache_name
 django.db.models.fields.related.ForeignObjectRel.accessor_name
-django.db.models.fields.related.ForeignObjectRel.cache_name
-django.db.models.fields.related.RelatedField.cache_name
 django.db.models.fields.reverse_related.ForeignObjectRel.accessor_name
-django.db.models.fields.reverse_related.ForeignObjectRel.cache_name
 django.db.models.functions.ConcatPair.pipes_concat_sql
 django.db.models.functions.text.ConcatPair.pipes_concat_sql
 django.db.models.lookups.In.get_refs