Fix Oracle backend feature stubs

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

@@ -1,9 +1,14 @@
 from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures
 from django.db.backends.oracle.features import DatabaseFeatures as OracleDatabaseFeatures
+from django.utils.functional import cached_property
 
 class DatabaseFeatures(BaseSpatialFeatures, OracleDatabaseFeatures):
     supports_add_srs_entry: bool
     supports_geometry_field_introspection: bool
     supports_geometry_field_unique_index: bool
     supports_perimeter_geodetic: bool
     supports_dwithin_distance_expr: bool
+    supports_tolerance_parameter: bool
+
+    @cached_property
+    def django_test_skips(self) -> dict[str, set[str]]: ...  # type: ignore[override]

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

@@ -26,11 +26,13 @@ class OracleOperations(BaseSpatialOperations, DatabaseOperations):
     Adapter: Any
     extent: str
     unionagg: str
+    from_text: str  # type: ignore[assignment]
     function_names: Any
     select: str
     gis_operators: Any
     unsupported_functions: Any
     def geo_quote_name(self, name: Any) -> Any: ...
+    def convert_extent(self, clob: Any) -> tuple[float, float, float, float] | None: ...  # type: ignore[override]
     def geo_db_type(self, f: Any) -> Any: ...
     def get_distance(self, f: Any, value: Any, lookup_type: Any) -> Any: ...
     def get_geom_placeholder(self, f: Any, value: Any, compiler: Any) -> Any: ...

django-stubs/db/backends/oracle/base.pyi

@@ -3,6 +3,7 @@ from contextlib import AbstractContextManager
 from typing import Any
 
 from django.db.backends.base.base import BaseDatabaseWrapper
+from django.utils.functional import cached_property
 
 from .client import DatabaseClient
 from .creation import DatabaseCreation
@@ -40,15 +41,22 @@ class DatabaseWrapper(BaseDatabaseWrapper):
     Database: Any
     SchemaEditorClass: Any
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
+    @property
+    def is_pool(self) -> bool: ...
+    @property
+    def pool(self) -> Any: ...
+    def close_pool(self) -> None: ...
     def get_connection_params(self) -> Any: ...
     def get_new_connection(self, conn_params: Any) -> Any: ...
     pattern_ops: Any
     def init_connection_state(self) -> None: ...
     def create_cursor(self, name: Any | None = None) -> Any: ...
     def check_constraints(self, table_names: Any | None = None) -> None: ...
-    def is_usable(self) -> Any: ...
-    @property
-    def oracle_version(self) -> Any: ...
+    def is_usable(self) -> bool: ...
+    @cached_property
+    def oracle_version(self) -> tuple[int, ...]: ...
+    @cached_property
+    def oracledb_version(self) -> tuple[int, ...]: ...
 
 class OracleParam:
     force_bytes: Any

django-stubs/db/backends/oracle/features.pyi

@@ -13,7 +13,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     has_select_for_update_of: bool
     select_for_update_of_column: bool
     can_return_columns_from_insert: bool
-    can_introspect_autofield: bool
     supports_subqueries_in_group_by: bool
     supports_transactions: bool
     supports_timezones: bool
@@ -25,33 +24,48 @@ class DatabaseFeatures(BaseDatabaseFeatures):
     supports_tablespaces: bool
     supports_sequence_reset: bool
     can_introspect_materialized_views: bool
-    can_introspect_time_field: bool
     atomic_transactions: bool
-    supports_combined_alters: bool
     nulls_order_largest: bool
     requires_literal_defaults: bool
     closed_cursor_error_class: Any
-    bare_select_suffix: str
     supports_select_for_update_with_limit: bool
     supports_temporal_subtraction: bool
     ignores_table_name_case: bool
     supports_index_on_text_field: bool
-    has_case_insensitive_like: bool
     create_test_procedure_without_params_sql: str
     create_test_procedure_with_int_param_sql: str
     supports_callproc_kwargs: bool
     supports_over_clause: bool
     supports_frame_range_fixed_distance: bool
     supports_ignore_conflicts: bool
-    max_query_params: Any
+    max_query_params: int
     supports_partial_indexes: bool
     supports_slicing_ordering_in_compound: bool
     allows_multiple_constraints_on_same_fields: bool
-    supports_primitives_in_json_field: bool
     supports_json_field_contains: bool
     can_return_rows_from_update: bool
     supports_aggregate_order_by_clause: bool
     supports_any_value: bool
     supports_tuple_comparison_against_subquery: bool
+    supports_json_negative_indexing: bool
+
+    @cached_property
+    def django_test_skips(self) -> dict[str, set[str]]: ...  # type: ignore[override]
+    @cached_property
+    def introspected_field_types(self) -> dict[str, str]: ...  # type: ignore[override]
+    @cached_property
+    def test_collations(self) -> dict[str, str | None]: ...  # type: ignore[override]
+    @cached_property
+    def supports_collation_on_charfield(self) -> bool: ...  # type: ignore[override]
+    @cached_property
+    def supports_primitives_in_json_field(self) -> bool: ...  # type: ignore[override]
+    @cached_property
+    def supports_frame_exclusion(self) -> bool: ...  # type: ignore[override]
+    @cached_property
+    def supports_comparing_boolean_expr(self) -> bool: ...  # type: ignore[override]
+    @cached_property
+    def supports_aggregation_over_interval_types(self) -> bool: ...
+    @cached_property
+    def bare_select_suffix(self) -> str: ...  # type: ignore[override]
     @cached_property
-    def supports_json_negative_indexing(self) -> bool: ...  # type: ignore[override]
+    def supports_tuple_lookups(self) -> bool: ...

scripts/stubtest/allowlist_todo.txt

@@ -80,7 +80,6 @@ django.contrib.flatpages.models.FlatPage.template_name
 django.contrib.flatpages.models.FlatPage.title
 django.contrib.flatpages.models.FlatPage.url
 django.contrib.gis.admin.site
-django.contrib.gis.db.backends.oracle.features.DatabaseFeatures.django_test_skips
 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
@@ -247,10 +246,6 @@ django.contrib.staticfiles.storage.staticfiles_storage
 django.core.cache.cache
 django.db.backends.ddl_references.Expressions
 django.db.backends.mysql.base.DatabaseWrapper.ops
-django.db.backends.oracle.features.DatabaseFeatures.django_test_skips
-django.db.backends.oracle.features.DatabaseFeatures.introspected_field_types
-django.db.backends.oracle.features.DatabaseFeatures.supports_collation_on_charfield
-django.db.backends.oracle.features.DatabaseFeatures.supports_frame_exclusion
 django.db.backends.postgresql.base.DatabaseWrapper.ops
 django.db.backends.sqlite3.base.DatabaseWrapper.ops
 django.db.backends.utils.debug_transaction

scripts/stubtest/allowlist_todo_django52.txt

@@ -2,25 +2,13 @@
 
 # Created for 5.2 update:
 django.contrib.gis.db.backends.mysql.schema.MySQLGISSchemaEditor.__init__
-django.contrib.gis.db.backends.oracle.operations.OracleOperations.convert_extent
-django.contrib.gis.db.backends.oracle.operations.OracleOperations.from_text
 django.contrib.gis.db.models.ForeignKey.cast_db_type
 django.contrib.gis.db.models.Q.identity
 django.contrib.gis.geos.prototypes.io.DEFAULT_TRIM_VALUE
 django.db.backends.base.features.BaseDatabaseFeatures.rounds_to_even
 django.db.backends.base.features.BaseDatabaseFeatures.supports_tuple_lookups
 django.db.backends.base.schema.BaseDatabaseSchemaEditor.sql_pk_constraint
-django.db.backends.oracle.base.DatabaseWrapper.close_pool
-django.db.backends.oracle.base.DatabaseWrapper.is_pool
 django.db.backends.oracle.base.DatabaseWrapper.ops
-django.db.backends.oracle.base.DatabaseWrapper.oracledb_version
-django.db.backends.oracle.base.DatabaseWrapper.pool
-django.db.backends.oracle.features.DatabaseFeatures.bare_select_suffix
-django.db.backends.oracle.features.DatabaseFeatures.supports_aggregation_over_interval_types
-django.db.backends.oracle.features.DatabaseFeatures.supports_comparing_boolean_expr
-django.db.backends.oracle.features.DatabaseFeatures.supports_primitives_in_json_field
-django.db.backends.oracle.features.DatabaseFeatures.supports_tuple_lookups
-django.db.backends.oracle.features.DatabaseFeatures.test_collations
 django.db.models.ForeignKey.cast_db_type
 django.db.models.Q.identity
 django.db.models.fields.related.ForeignKey.cast_db_type