8000 Update django gis backend (#2657) · typeddjango/django-stubs@68cc7ed · GitHub
[go: up one dir, main page]
Skip to content

Commit 68cc7ed

Browse files
UnknownPlatypusUnknownPlatypus
authored
Update django gis backend (#2657)
* Update `django/contrib/gis/db/backends/base/features.py` * Add missing `mariadb` in gis `BaseSpatialOperations` * Add missing `supports_geography`
1 parent b87968c commit 68cc7ed

File tree

6 files changed

+10
-20
lines changed

6 files changed

+10
-20
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ class BaseSpatialFeatures:
55
has_spatialrefsys_table: bool
66
supports_add_srs_entry: bool
77
supports_geometry_field_introspection: bool
8+
supports_geography: bool
89
supports_3d_storage: bool
910
supports_3d_functions: bool
1011
supports_transform: bool
@@ -19,6 +20,10 @@ class BaseSpatialFeatures:
1920
supports_dwithin_distance_expr: bool
2021
supports_raster: bool
2122
supports_geometry_field_unique_index: bool
23+
can_alter_geometry_field: bool
24+
supports_tolerance_parameter: bool
25+
unsupported_geojson_options: set[str]
26+
empty_intersection_returns_none: bool
2227
@property
2328
def supports_bbcontains_lookup(self) -> bool: ...
2429
@property

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ from django.utils.functional import cached_property
55
class BaseSpatialOperations:
66
postgis: bool
77
spatialite: bool
8+
mariadb: bool
89
mysql: bool
910
oracle: bool
1011
spatial_version: Any

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from typing import Any
2-
31
from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures
42
from django.db.backends.mysql.features import DatabaseFeatures as MySQLDatabaseFeatures
53
from django.utils.functional import cached_property
@@ -13,9 +11,5 @@ class DatabaseFeatures(BaseSpatialFeatures, MySQLDatabaseFeatures):
1311
supports_transform: bool
1412
supports_null_geometries: bool
1513
supports_num_points_poly: bool
16-
@property
17-
def empty_intersection_returns_none(self) -> bool: ...
1814
@cached_property
1915
def supports_geometry_field_unique_index(self) -> bool: ... # type: ignore[override]
20-
@cached_property
21-
def django_test_skips(self) -> dict[str, Any]: ... # type: ignore[override]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class MySQLOperations(BaseSpatialOperations, DatabaseOperations):
1212
geom_func_prefix: str
1313
Adapter: Any
1414
@cached_property
15-
def mariadb(self) -> bool: ...
15+
def mariadb(self) -> bool: ... # type: ignore[override]
1616
@cached_property
1717
def mysql(self) -> bool: ... # type: ignore[override]
1818
@cached_property

‎scripts/stubtest/allowlist.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ django.contrib.admin.helpers.InlineAdminFormSet.is_collapsible
161161
django.contrib.contenttypes.fields.GenericForeignKey.cache_name
162162
django.contrib.contenttypes.fields.ReverseGenericManyToOneDescriptor.related_manager_cls
163163
django.contrib.gis.db.backends.base.operations.BaseSpatialOperations.select_extent
164-
django.contrib.gis.db.backends.mysql.features.DatabaseFeatures.django_test_skips
165164
django.contrib.gis.db.backends.mysql.features.DatabaseFeatures.supports_geometry_field_unique_index
166165
django.contrib.gis.db.backends.mysql.operations.MySQLOperations.collect
167166
django.contrib.gis.db.backends.mysql.operations.MySQLOperations.from_text
@@ -554,3 +553,6 @@ django.contrib.gis.forms.BaseModelFormSet.save_m2m
554553

555554
# Dynamically generated in https://github.com/django/django/blob/0ee06c04e0256094270db3ffe8b5dafa6a8457a3/django/core/mail/backends/locmem.py#L24
556555
django.core.mail.outbox
556+
557+
# Variable is supposed to be a set but is initialised to an empty dict
558+
django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.unsupported_geojson_options

‎scripts/stubtest/allowlist_todo.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,13 @@ django.contrib.gis.admin.options.GISModelAdmin
157157
django.contrib.gis.admin.options.GISModelAdmin.gis_widget
158158
django.contrib.gis.admin.options.GeoModelAdminMixin
159159
django.contrib.gis.admin.site
160-
django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.can_alter_geometry_field
161-
django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.empty_intersection_returns_none
162-
django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.supports_geography
163-
django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.supports_tolerance_parameter
164-
django.contrib.gis.db.backends.base.features.BaseSpatialFeatures.unsupported_geojson_options
165-
django.contrib.gis.db.backends.base.operations.BaseSpatialOperations.mariadb
166160
django.contrib.gis.db.backends.mysql.base
167-
django.contrib.gis.db.backends.mysql.features.DatabaseFeatures.unsupported_geojson_options
168161
django.contrib.gis.db.backends.mysql.introspection
169162
django.contrib.gis.db.backends.oracle.features.DatabaseFeatures.django_test_skips
170-
django.contrib.gis.db.backends.oracle.features.DatabaseFeatures.supports_tolerance_parameter
171-
django.contrib.gis.db.backends.oracle.features.DatabaseFeatures.unsupported_geojson_options
172-
django.contrib.gis.db.backends.postgis.features.DatabaseFeatures.empty_intersection_returns_none
173-
django.contrib.gis.db.backends.postgis.features.DatabaseFeatures.supports_geography
174163
django.contrib.gis.db.backends.postgis.operations.PostGISOperations.convert_extent
175164
django.contrib.gis.db.backends.postgis.operations.PostGISOperations.convert_extent3d
176165
django.contrib.gis.db.backends.postgis.schema.PostGISSchemaEditor.rast_index_template
177166
django.contrib.gis.db.backends.spatialite.base.DatabaseWrapper.ops
178-
django.contrib.gis.db.backends.spatialite.features.DatabaseFeatures.can_alter_geometry_field
179167
django.contrib.gis.db.backends.spatialite.features.DatabaseFeatures.django_test_skips
180168
django.contrib.gis.db.backends.spatialite.operations.SpatiaLiteOperations.convert_extent
181169
django.contrib.gis.db.backends.spatialite.operations.SpatiaLiteOperations.from_text

0 commit comments

Comments
 (0)
0