Update django gis backend (#2657)

* Update `django/contrib/gis/db/backends/base/features.py`

* Add missing `mariadb` in gis `BaseSpatialOperations`

* Add missing `supports_geography`

Author: UnknownPlatypus

django-stubs/contrib/gis/db/backends/base/features.pyi

@@ -5,6 +5,7 @@ class BaseSpatialFeatures:
     has_spatialrefsys_table: bool
     supports_add_srs_entry: bool
     supports_geometry_field_introspection: bool
+    supports_geography: bool
     supports_3d_storage: bool
     supports_3d_functions: bool
     supports_transform: bool
@@ -19,6 +20,10 @@ class BaseSpatialFeatures:
     supports_dwithin_distance_expr: bool
     supports_raster: bool
     supports_geometry_field_unique_index: bool
+    can_alter_geometry_field: bool
+    supports_tolerance_parameter: bool
+    unsupported_geojson_options: set[str]
+    empty_intersection_returns_none: bool
     @property
     def supports_bbcontains_lookup(self) -> bool: ...
     @property

django-stubs/contrib/gis/db/backends/base/operations.pyi

@@ -5,6 +5,7 @@ from django.utils.functional import cached_property
 class BaseSpatialOperations:
     postgis: bool
     spatialite: bool
+    mariadb: bool
     mysql: bool
     oracle: bool
     spatial_version: Any

django-stubs/contrib/gis/db/backends/mysql/features.pyi

@@ -1,5 +1,3 @@
-from typing import Any
-
 from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures
 from django.db.backends.mysql.features import DatabaseFeatures as MySQLDatabaseFeatures
 from django.utils.functional import cached_property
@@ -13,9 +11,5 @@ class DatabaseFeatures(BaseSpatialFeatures, MySQLDatabaseFeatures):
     supports_transform: bool
     supports_null_geometries: bool
     supports_num_points_poly: bool
-    @property
-    def empty_intersection_returns_none(self) -> bool: ...
     @cached_property
     def supports_geometry_field_unique_index(self) -> bool: ...  # type: ignore[override]
-    @cached_property
-    def django_test_skips(self) -> dict[str, Any]: ...  # type: ignore[override]

django-stubs/contrib/gis/db/backends/mysql/operations.pyi

@@ -12,7 +12,7 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations):
     geom_func_prefix: str
     Adapter: Any
     @cached_property
-    def mariadb(self) -> bool: ...
+    def mariadb(self) -> bool: ...  # type: ignore[override]
     @cached_property
     def mysql(self) -> bool: ...  # type: ignore[override]
     @cached_property

scripts/stubtest/allowlist.txt

@@ -161,7 +161,6 @@ 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
 django.contrib.gis.db.backends.mysql.features.DatabaseFeatures.supports_geometry_field_unique_index
 django.contrib.gis.db.backends.mysql.operations.MySQLOperations.collect
 django.contrib.gis.db.backends.mysql.operations.MySQLOperations.from_text
@@ -554,3 +553,6 @@ django.contrib.gis.forms.BaseModelFormSet.save_m2m
 
 # Dynamically generated in https://github.com/django/django/blob/0ee06c04e0256094270db3ffe8b5dafa6a8457a3/django/core/mail/backends/locmem.py#L24
 django.core.mail.outbox
+
+# Variable is supposed to be a set but is initialised to an empty dict
+django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.unsupported_geojson_options

scripts/stubtest/allowlist_todo.txt

@@ -157,25 +157,13 @@ django.contrib.gis.admin.options.GISModelAdmin
 django.contrib.gis.admin.options.GISModelAdmin.gis_widget
 django.contrib.gis.admin.options.GeoModelAdminMixin
 django.contrib.gis.admin.site
-django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.can_alter_geometry_field
-django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.empty_intersection_returns_none
-django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.supports_geography
-django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.supports_tolerance_parameter
-django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.unsupported_geojson_options
-django.contrib.gis.db.backends.base.operations.BaseSpatialOperations.mariadb
 django.contrib.gis.db.backends.mysql.base
-django.contrib.gis.db.backends.mysql.features.DatabaseFeatures.unsupported_geojson_options
 django.contrib.gis.db.backends.mysql.introspection
 django.contrib.gis.db.backends.oracle.features.DatabaseFeatures.django_test_skips
-django.contrib.gis.db.backends.oracle.features.DatabaseFeatures.supports_tolerance_parameter
-django.contrib.gis.db.backends.oracle.features.DatabaseFeatures.unsupported_geojson_options
-django.contrib.gis.db.backends.postgis.features.DatabaseFeatures.empty_intersection_returns_none
-django.contrib.gis.db.backends.postgis.features.DatabaseFeatures.supports_geography
 django.contrib.gis.db.backends.postgis.operations.PostGISOperations.convert_extent
 django.contrib.gis.db.backends.postgis.operations.PostGISOperations.convert_extent3d
 django.contrib.gis.db.backends.postgis.schema.PostGISSchemaEditor.rast_index_template
 django.contrib.gis.db.backends.spatialite.base.DatabaseWrapper.ops
-django.contrib.gis.db.backends.spatialite.features.DatabaseFeatures.can_alter_geometry_field
 django.contrib.gis.db.backends.spatialite.features.DatabaseFeatures.django_test_skips
 django.contrib.gis.db.backends.spatialite.operations.SpatiaLiteOperations.convert_extent
 django.contrib.gis.db.backends.spatialite.operations.SpatiaLiteOperations.from_text