Merge branch 'master' into fix/site-name-stub

Author: ahmedasar00

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

@@ -9,9 +9,6 @@ logger: Logger
 
 class MySQLGISSchemaEditor(DatabaseSchemaEditor):
     sql_add_spatial_index: str
-    sql_drop_spatial_index: str
-    geometry_sql: Any
-    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     def skip_default(self, field: Field) -> bool: ...
     def column_sql(
         self, model: type[Model], field: Field, include_default: bool = ...

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/base/features.pyi

@@ -144,6 +144,8 @@ class BaseDatabaseFeatures:
     prohibits_null_characters_in_text_exception: tuple[ValueError | DataError] | None
     supports_unlimited_charfield: bool
     supports_tuple_comparison_against_subquery: bool
+    rounds_to_even: bool
+    supports_tuple_lookups: bool
     test_collations: dict[str, str | None]
     test_now_utc_template: str | None
     insert_test_table_with_defaults: str | None

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

@@ -51,6 +51,7 @@ class BaseDatabaseSchemaEditor(AbstractContextManager[Any]):
     sql_delete_index: str
     sql_create_pk: str
     sql_delete_pk: str
+    sql_pk_constraint: str
     sql_delete_procedure: str
     sql_alter_table_comment: str
     sql_alter_column_comment: str

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: ...  # type: ignore[override]

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

@@ -228,6 +228,7 @@ class Field(RegisterLookupMixin, Generic[_ST, _GT]):
     @property
     def flatchoices(self) -> list[_Choice]: ...
     def has_default(self) -> bool: ...
+    def has_db_default(self) -> bool: ...
     def get_default(self) -> Any: ...
     def check(self, **kwargs: Any) -> list[CheckMessage]: ...
     def get_col(self, alias: str, output_field: Field | None = None) -> Col: ...

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

@@ -3,6 +3,7 @@ from typing import Any, Generic, Literal, TypeVar, overload
 from uuid import UUID
 
 from django.core import validators  # due to weird mypy.stubtest error
+from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.models.base import Model
 from django.db.models.expressions import Combinable, Expression
 from django.db.models.fields import NOT_PROVIDED, Field, _AllLimitChoicesTo, _ErrorMessagesMapping, _LimitChoicesTo
@@ -187,6 +188,7 @@ class ForeignKey(ForeignObject[_ST, _GT]):
         error_messages: _ErrorMessagesMapping | None = ...,
         db_comment: str | None = ...,
     ) -> None: ...
+    def cast_db_type(self, connection: BaseDatabaseWrapper) -> str | None: ...
 
 class OneToOneField(ForeignKey[_ST, _GT]):
     _pyi_private_set_type: Any | Combinable

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

@@ -0,0 +1,41 @@
+from typing import Any
+
+from django.db.backends.base.base import BaseDatabaseWrapper
+from django.db.models.expressions import Func
+from django.db.models.fields import Field
+from django.db.models.lookups import Exact, GreaterThan, GreaterThanOrEqual, In, IsNull, LessThan, LessThanOrEqual
+from django.db.models.sql.compiler import SQLCompiler, _AsSqlType
+
+class Tuple(Func):
+    function: str
+    output_field: Field
+    def __len__(self) -> int: ...
+    def __iter__(self) -> Any: ...
+    def as_sqlite(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper) -> _AsSqlType: ...  # type: ignore[override]
+
+class TupleLookupMixin:
+    allows_composite_expressions: bool
+    def get_prep_lookup(self) -> Any: ...
+    def check_rhs_is_tuple_or_list(self) -> None: ...
+    def check_rhs_length_equals_lhs_length(self) -> None: ...
+    def check_rhs_is_supported_expression(self) -> None: ...
+    def get_lhs_str(self) -> str: ...
+    def get_prep_lhs(self) -> Any: ...
+    def process_lhs(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper, lhs: Any = None) -> _AsSqlType: ...
+    def process_rhs(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper) -> _AsSqlType: ...
+    def get_fallback_sql(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper) -> _AsSqlType: ...
+    def as_sql(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper) -> _AsSqlType: ...
+
+class TupleExact(TupleLookupMixin, Exact): ...
+class TupleIsNull(TupleLookupMixin, IsNull): ...
+class TupleGreaterThan(TupleLookupMixin, GreaterThan): ...
+class TupleGreaterThanOrEqual(TupleLookupMixin, GreaterThanOrEqual): ...
+class TupleLessThan(TupleLookupMixin, LessThan): ...
+class TupleLessThanOrEqual(TupleLookupMixin, LessThanOrEqual): ...
+
+class TupleIn(TupleLookupMixin, In):
+    def check_rhs_is_collection_of_tuples_or_lists(self) -> None: ...
+    def check_rhs_elements_length_equals_lhs_length(self) -> None: ...
+    def check_rhs_is_query(self) -> None: ...
+
+tuple_lookups: dict[str, type[TupleLookupMixin]]