django-types 0.22.0__py3-none-any.whl → 0.23.0__py3-none-any.whl

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

@@ -3,26 +3,26 @@ import ipaddress
 import uuid
 from collections.abc import Callable, Iterable, Mapping, Sequence
 from datetime import date, datetime, time, timedelta
-from typing import Any, Generic, Literal, TypeVar, overload
-from typing_extensions import Self
+from typing import Any, Generic, Literal, TypeAlias, TypeVar, overload
 
 from django.core.checks import CheckMessage
 from django.core.exceptions import FieldDoesNotExist as FieldDoesNotExist
-from django.db.models import Model, TextChoices
+from django.db.models import IntegerChoices, Model, TextChoices
 from django.db.models.expressions import Col, Combinable, Func
 from django.db.models.query_utils import RegisterLookupMixin
 from django.forms import Widget
+from typing_extensions import Self
 
 BLANK_CHOICE_DASH: list[tuple[str, str]] = ...
 
-_Choice = tuple[Any, str]
-_ChoiceNamedGroup = tuple[str, Iterable[_Choice]]
-_ChoicesMapping = Mapping[Any, str | Mapping[Any, str]]
-_LiteralFieldChoices = Iterable[_Choice | _ChoiceNamedGroup] | _ChoicesMapping
-_FieldChoices = _LiteralFieldChoices | Callable[[], _LiteralFieldChoices]
+_Choice: TypeAlias = tuple[Any, str]
+_ChoiceNamedGroup: TypeAlias = tuple[str, Iterable[_Choice]]
+_ChoicesMapping: TypeAlias = Mapping[Any, str | Mapping[Any, str]]
+_LiteralFieldChoices: TypeAlias = Iterable[_Choice | _ChoiceNamedGroup] | _ChoicesMapping
+_FieldChoices: TypeAlias = _LiteralFieldChoices | Callable[[], _LiteralFieldChoices]
 
-_ValidatorCallable = Callable[..., None]
-_ErrorMessagesToOverride = dict[str, Any]
+_ValidatorCallable: TypeAlias = Callable[..., None]
+_ErrorMessagesToOverride: TypeAlias = dict[str, Any]
 
 # __set__ value type
 _ST = TypeVar("_ST")
@@ -40,6 +40,7 @@ class Field(RegisterLookupMixin, Generic[_ST, _GT]):
     primary_key: bool
     remote_field: Field[_ST, _GT]
     is_relation: bool
+    hidden: bool
     related_model: Any | None = ...
     one_to_many: bool | None = ...
     one_to_one: bool | None = ...
@@ -134,7 +135,7 @@ class IntegerField(Generic[_I], Field[_I | Combinable, _I]):
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -162,7 +163,7 @@ class IntegerField(Generic[_I], Field[_I | Combinable, _I]):
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -195,7 +196,7 @@ class PositiveIntegerField(PositiveIntegerRelDbTypeMixin, IntegerField[_I]):
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -223,7 +224,7 @@ class PositiveIntegerField(PositiveIntegerRelDbTypeMixin, IntegerField[_I]):
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -253,9 +254,10 @@ class PositiveSmallIntegerField(PositiveIntegerRelDbTypeMixin, IntegerField[_I])
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,
@@ -280,7 +282,7 @@ class PositiveSmallIntegerField(PositiveIntegerRelDbTypeMixin, IntegerField[_I])
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]]  | type[IntegerChoices]= ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -310,7 +312,7 @@ class SmallIntegerField(IntegerField[_I]):
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]]  | type[IntegerChoices]= ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -338,7 +340,7 @@ class SmallIntegerField(IntegerField[_I]):
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]]  | type[IntegerChoices]= ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -368,7 +370,7 @@ class BigIntegerField(IntegerField[_I]):
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -396,7 +398,7 @@ class BigIntegerField(IntegerField[_I]):
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -426,7 +428,7 @@ class PositiveBigIntegerField(IntegerField[_I]):
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -454,7 +456,7 @@ class PositiveBigIntegerField(IntegerField[_I]):
         unique_for_date: str | None = ...,
         unique_for_month: str | None = ...,
         unique_for_year: str | None = ...,
-        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] = ...,
+        choices: Iterable[tuple[_I, str] | tuple[str, Iterable[tuple[_I, str]]]] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -620,7 +622,7 @@ class AutoField(AutoFieldMixin, IntegerField[int], metaclass=AutoFieldMeta):
         unique_for_year: str | None = ...,
         choices: Iterable[
             tuple[int, str] | tuple[str, Iterable[tuple[int, str]]]
-        ] = ...,
+        ] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -652,7 +654,7 @@ class BigAutoField(AutoFieldMixin, BigIntegerField[int]):
         unique_for_year: str | None = ...,
         choices: Iterable[
             tuple[int, str] | tuple[str, Iterable[tuple[int, str]]]
-        ] = ...,
+        ] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -684,7 +686,7 @@ class SmallAutoField(AutoFieldMixin, SmallIntegerField[int]):
         unique_for_year: str | None = ...,
         choices: Iterable[
             tuple[int, str] | tuple[str, Iterable[tuple[int, str]]]
-        ] = ...,
+        ] | type[IntegerChoices] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
         db_comment: str | None = ...,
@@ -1055,6 +1057,7 @@ class BooleanField(Generic[_B], Field[_B | Combinable, _B]):
         choices: Iterable[tuple[_B, str] | tuple[str, Iterable[tuple[_B, str]]]] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,

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

@@ -2,14 +2,13 @@ from collections.abc import Iterable, Iterator, Mapping
 from typing import Any, Literal
 
 from django.contrib.contenttypes.fields import GenericForeignKey
-
-from django.db.models.fields import NOT_PROVIDED, Field
 from django.db.models.base import Model
+from django.db.models.fields import NOT_PROVIDED, Field
 from django.db.models.fields.reverse_related import ForeignObjectRel
 from django.utils.functional import cached_property
 
 StrOrPromise = str
-from django.db.models.fields import Field, _ValidatorCallable, _LiteralFieldChoices
+from django.db.models.fields import _LiteralFieldChoices, _ValidatorCallable
 
 class AttributeSetter:
     def __init__(self, name: str, value: Any) -> None: ...

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

@@ -1,6 +1,5 @@
 from collections.abc import Callable, Iterable
 from typing import Any, overload
-from typing_extensions import Self
 
 from django.core.files.base import File
 from django.core.files.images import ImageFile
@@ -12,6 +11,7 @@ from django.db.models.fields import (
     _ErrorMessagesToOverride,
     _ValidatorCallable,
 )
+from typing_extensions import Self
 
 class FieldFile(File):
     instance: Model = ...
@@ -65,6 +65,7 @@ class FileField(Field[FileDescriptor, FileDescriptor]):
         ] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,
@@ -115,6 +116,7 @@ class ImageField(FileField):
         ] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,

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

@@ -0,0 +1,84 @@
+from collections.abc import Iterable
+from typing import Any, Literal, TypeVar, overload
+
+from django.db.models import Combinable, Expression, ForeignObjectRel
+from django.db.models.expressions import Col
+from typing_extensions import Never
+
+from . import Field, _ErrorMessagesToOverride, _ValidatorCallable
+from .mixins import CheckFieldDefaultMixin
+
+_GT = TypeVar("_GT", bound=Any | None)
+
+class GeneratedField(CheckFieldDefaultMixin, Field[Never, _GT]):
+    generated: Literal[True]
+    db_returning: Literal[True]
+    expression: Combinable | Expression
+
+    @overload
+    def __new__(
+        cls,
+        *,
+        expression: Combinable | Expression,
+        output_field: Field[Any, _GT],
+        db_persist: bool,
+        #
+        verbose_name: str | None = ...,
+        name: str | None = ...,
+        primary_key: bool = ...,
+        max_length: int | None = ...,
+        unique: bool = ...,
+        blank: Literal[True] = ...,
+        null: Literal[False] = False,
+        db_index: bool = ...,
+        rel: ForeignObjectRel | None = ...,
+        editable: Literal[False] = ...,
+        serialize: bool = ...,
+        unique_for_date: str | None = ...,
+        unique_for_month: str | None = ...,
+        unique_for_year: str | None = ...,
+        choices: Iterable[tuple[Any, str] | tuple[str, Iterable[tuple[Any, str]]]] = ...,
+        help_text: str = ...,
+        db_column: str | None = ...,
+        db_tablespace: str | None = ...,
+        auto_created: bool = ...,
+        validators: Iterable[_ValidatorCallable] = ...,
+        error_messages: _ErrorMessagesToOverride | None = ...,
+        db_comment: str | None = ...,
+    ) -> GeneratedField[_GT]: ...
+    @overload
+    def __new__(
+        cls,
+        *,
+        expression: Combinable | Expression,
+        output_field: Field[Any, _GT],
+        db_persist: bool,
+        #
+        verbose_name: str | None = ...,
+        name: str | None = ...,
+        primary_key: bool = ...,
+        max_length: int | None = ...,
+        unique: bool = ...,
+        blank: Literal[True] = ...,
+        null: Literal[True],
+        db_index: bool = ...,
+        rel: ForeignObjectRel | None = ...,
+        editable: Literal[False] = ...,
+        serialize: bool = ...,
+        unique_for_date: str | None = ...,
+        unique_for_month: str | None = ...,
+        unique_for_year: str | None = ...,
+        choices: Iterable[tuple[Any, str] | tuple[str, Iterable[tuple[Any, str]]]] = ...,
+        help_text: str = ...,
+        db_column: str | None = ...,
+        db_tablespace: str | None = ...,
+        auto_created: bool = ...,
+        validators: Iterable[_ValidatorCallable] = ...,
+        error_messages: _ErrorMessagesToOverride | None = ...,
+        db_comment: str | None = ...,
+    ) -> GeneratedField[_GT | None]: ...
+    @property
+    def cached_col(self) -> Col: ...
+    def generated_sql(self, connection: Any) -> tuple[str, list[Any]]: ...
+
+__all__ = ["GeneratedField"]

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

@@ -1,11 +1,11 @@
 import json
 from collections.abc import Callable, Iterable
 from typing import Any, Literal, TypeVar, overload
-from typing_extensions import Self
 
 from django.db.models import lookups
 from django.db.models.expressions import Combinable
 from django.db.models.lookups import PostgresOperatorLookup, Transform
+from typing_extensions import Self
 
 from . import Field, _ErrorMessagesToOverride, _ValidatorCallable
 from .mixins import CheckFieldDefaultMixin
@@ -45,6 +45,7 @@ class JSONField(CheckFieldDefaultMixin, Field[_A | Combinable, _A]):
         ] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,
@@ -75,6 +76,7 @@ class JSONField(CheckFieldDefaultMixin, Field[_A | Combinable, _A]):
         ] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,

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

@@ -1,6 +1,5 @@
 from collections.abc import Callable, Iterable, Sequence
-from typing import Any, Generic, Literal, Protocol, TypeVar, overload
-from typing_extensions import Self
+from typing import Any, Generic, Literal, Protocol, TypeAlias, TypeVar, overload
 from uuid import UUID
 
 from django.db import models
@@ -11,7 +10,7 @@ from django.db.models.fields.mixins import FieldCacheMixin
 from django.db.models.fields.related_descriptors import (
     ForwardManyToOneDescriptor as ForwardManyToOneDescriptor,
 )
-from django.db.models.fields.related_descriptors import (  # noqa: F401
+from django.db.models.fields.related_descriptors import (
     ForwardOneToOneDescriptor as ForwardOneToOneDescriptor,
 )
 from django.db.models.fields.related_descriptors import (
@@ -23,14 +22,13 @@ from django.db.models.fields.related_descriptors import (
 from django.db.models.fields.related_descriptors import (
     ReverseOneToOneDescriptor as ReverseOneToOneDescriptor,
 )
-from django.db.models.fields.reverse_related import (  # noqa: F401
-    ForeignObjectRel as ForeignObjectRel,
-)
+from django.db.models.fields.reverse_related import ForeignObjectRel as ForeignObjectRel
 from django.db.models.fields.reverse_related import ManyToManyRel as ManyToManyRel
 from django.db.models.fields.reverse_related import ManyToOneRel as ManyToOneRel
 from django.db.models.fields.reverse_related import OneToOneRel as OneToOneRel
 from django.db.models.manager import ManyToManyRelatedManager
 from django.db.models.query_utils import PathInfo, Q
+from typing_extensions import Self
 
 class _DeleteProtocol(Protocol):
     def __call__(
@@ -42,14 +40,14 @@ class _DeleteProtocol(Protocol):
     ) -> None: ...
 
 _F = TypeVar("_F", bound=models.Field[Any, Any])
-_Choice = tuple[Any, str]
-_ChoiceNamedGroup = tuple[str, Iterable[_Choice]]
-_FieldChoices = Iterable[_Choice | _ChoiceNamedGroup]
-_ChoicesLimit = dict[str, Any] | Q | Callable[[], Q]
-_OnDeleteOptions = _DeleteProtocol | Callable[[Any], _DeleteProtocol]
+_Choice: TypeAlias = tuple[Any, str]
+_ChoiceNamedGroup: TypeAlias = tuple[str, Iterable[_Choice]]
+_FieldChoices: TypeAlias = Iterable[_Choice | _ChoiceNamedGroup]
+_ChoicesLimit: TypeAlias = dict[str, Any] | Q | Callable[[], Q]
+_OnDeleteOptions: TypeAlias = _DeleteProtocol | Callable[[Any], _DeleteProtocol]
 
-_ValidatorCallable = Callable[..., None]
-_ErrorMessagesToOverride = dict[str, Any]
+_ValidatorCallable: TypeAlias = Callable[..., None]
+_ErrorMessagesToOverride: TypeAlias = dict[str, Any]
 
 RECURSIVE_RELATIONSHIP_CONSTANT: str = ...
 
@@ -110,7 +108,7 @@ class ForeignObject(Generic[_M], RelatedField[_M, _M]):
         blank: bool = ...,
         null: Literal[False] = False,
         db_index: bool = ...,
-        default: _M | Callable[[], _M] | None = ...,
+        default: _M | Callable[[], _M] = ...,
         editable: bool = ...,
         auto_created: bool = ...,
         serialize: bool = ...,
@@ -120,6 +118,7 @@ class ForeignObject(Generic[_M], RelatedField[_M, _M]):
         choices: Iterable[tuple[_M, str] | tuple[str, Iterable[tuple[_M, str]]]] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,
@@ -147,7 +146,7 @@ class ForeignObject(Generic[_M], RelatedField[_M, _M]):
         blank: bool = ...,
         null: Literal[True],
         db_index: bool = ...,
-        default: _M | Callable[[], _M] = ...,
+        default: _M | Callable[[], _M | None] | None = ...,
         editable: bool = ...,
         auto_created: bool = ...,
         serialize: bool = ...,
@@ -157,6 +156,7 @@ class ForeignObject(Generic[_M], RelatedField[_M, _M]):
         choices: Iterable[tuple[_M, str] | tuple[str, Iterable[tuple[_M, str]]]] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,
@@ -189,7 +189,7 @@ class ForeignKey(Generic[_M], ForeignObject[_M]):
         blank: bool = ...,
         null: Literal[False] = False,
         db_index: bool = ...,
-        default: _M | Callable[[], _M] | None = ...,
+        default: _M | Callable[[], _M] = ...,
         editable: bool = ...,
         auto_created: bool = ...,
         serialize: bool = ...,
@@ -199,6 +199,7 @@ class ForeignKey(Generic[_M], ForeignObject[_M]):
         choices: Iterable[tuple[_M, str] | tuple[str, Iterable[tuple[_M, str]]]] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,
@@ -224,7 +225,7 @@ class ForeignKey(Generic[_M], ForeignObject[_M]):
         blank: bool = ...,
         null: Literal[True],
         db_index: bool = ...,
-        default: _M | Callable[[], _M] = ...,
+        default: _M | Callable[[], _M | None] | None = ...,
         editable: bool = ...,
         auto_created: bool = ...,
         serialize: bool = ...,
@@ -234,12 +235,13 @@ class ForeignKey(Generic[_M], ForeignObject[_M]):
         choices: Iterable[tuple[_M, str] | tuple[str, Iterable[tuple[_M, str]]]] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,
     ) -> ForeignKey[_M | None]: ...
     # class access
-    @overload
+    @overload  # type: ignore[override]
     def __get__(self, instance: None, owner: Any) -> ForwardManyToOneDescriptor: ...
     # Model instance access
     @overload
@@ -275,7 +277,7 @@ class OneToOneField(Generic[_M], ForeignKey[_M]):
         blank: bool = ...,
         null: Literal[False] = False,
         db_index: bool = ...,
-        default: _M | Callable[[], _M] | None = ...,
+        default: _M | Callable[[], _M] = ...,
         editable: bool = ...,
         auto_created: bool = ...,
         serialize: bool = ...,
@@ -285,6 +287,7 @@ class OneToOneField(Generic[_M], ForeignKey[_M]):
         choices: Iterable[tuple[_M, str] | tuple[str, Iterable[tuple[_M, str]]]] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,
@@ -310,7 +313,7 @@ class OneToOneField(Generic[_M], ForeignKey[_M]):
         blank: bool = ...,
         null: Literal[True],
         db_index: bool = ...,
-        default: _M | Callable[[], _M] = ...,
+        default: _M | Callable[[], _M | None] | None = ...,
         editable: bool = ...,
         auto_created: bool = ...,
         serialize: bool = ...,
@@ -320,12 +323,13 @@ class OneToOneField(Generic[_M], ForeignKey[_M]):
         choices: Iterable[tuple[_M, str] | tuple[str, Iterable[tuple[_M, str]]]] = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,
         error_messages: _ErrorMessagesToOverride | None = ...,
     ) -> OneToOneField[_M | None]: ...
     # class access
-    @overload
+    @overload  # type: ignore[override]
     def __get__(self, instance: None, owner: Any) -> ForwardOneToOneDescriptor: ...
     # Model instance access
     @overload
@@ -388,6 +392,7 @@ class ManyToManyField(
         choices: _FieldChoices | None = ...,
         help_text: str = ...,
         db_column: str | None = ...,
+        db_comment: str | None = ...,
         db_table: str | None = ...,
         db_tablespace: str | None = ...,
         validators: Iterable[_ValidatorCallable] = ...,

django-stubs/db/models/indexes.pyi

@@ -21,7 +21,7 @@ class Index:
 
     def __init__(
         self,
-        *expressions: BaseExpression | Combinable | str,
+        *expressions: BaseExpression | Combinable | Q | str,
         fields: Sequence[str] = ...,
         name: str | None = ...,
         db_tablespace: str | None = ...,

django-stubs/db/models/lookups.pyi

@@ -1,7 +1,6 @@
 from collections.abc import Iterable, Mapping
 from datetime import datetime
 from typing import Any, Generic, TypeVar
-from typing_extensions import Self
 
 from django.db.backends.sqlite3.base import DatabaseWrapper
 from django.db.models.expressions import Expression, Func
@@ -10,6 +9,7 @@ from django.db.models.query_utils import RegisterLookupMixin
 from django.db.models.sql.compiler import SQLCompiler
 from django.utils.datastructures import OrderedSet
 from django.utils.safestring import SafeText
+from typing_extensions import Self
 
 _T = TypeVar("_T")
 

django-stubs/db/models/manager.pyi

@@ -1,9 +1,9 @@
 from collections.abc import Callable, Iterable, MutableMapping
 from typing import Any, Generic, TypeVar
-from typing_extensions import Self
 
 from django.db.models.base import Model
 from django.db.models.query import QuerySet
+from typing_extensions import Self
 
 _T = TypeVar("_T", bound=Model)
 _V = TypeVar("_V", bound=Model)

django-stubs/db/models/options.pyi

@@ -57,6 +57,7 @@ class Options(Generic[_M]):
     verbose_name: str | None = ...
     verbose_name_plural: str | None = ...
     db_table: str = ...
+    db_table_comment: str | None = ...
     ordering: Sequence[str] | None = ...
     indexes: list[Any] = ...
     unique_together: list[Any] | tuple[Any, ...] = ...

django-stubs/db/models/query.pyi

@@ -10,15 +10,15 @@ from collections.abc import (
     Sized,
 )
 from typing import Any, Generic, TypeVar, overload
-from typing_extensions import Self
 
 from django.db import models
 from django.db.models import Manager
 from django.db.models.base import Model
-from django.db.models.expressions import Combinable as Combinable  # noqa: F401
+from django.db.models.expressions import Combinable as Combinable
 from django.db.models.expressions import F as F
-from django.db.models.query_utils import Q as Q  # noqa: F401
+from django.db.models.query_utils import Q as Q
 from django.db.models.sql.query import Query, RawQuery
+from typing_extensions import Self
 
 _T = TypeVar("_T", bound=models.Model)
 
@@ -63,7 +63,7 @@ class _BaseQuerySet(Generic[_T], Sized):
         objs: Iterable[_T],
         batch_size: int | None = ...,
         ignore_conflicts: bool = ...,
-        update_conflicts: Sequence[str] | None = ...,
+        update_conflicts: bool | None = ...,
         update_fields: Sequence[str] | None = ...,
         unique_fields: Sequence[str] | None = ...,
     ) -> list[_T]: ...
@@ -112,10 +112,10 @@ class _BaseQuerySet(Generic[_T], Sized):
     def raw(
         self,
         raw_query: str,
-        params: Any = ...,
+        params: tuple[Any] | list[Any] | dict[str, Any] = ...,
         translations: dict[str, str] | None = ...,
         using: str | None = ...,
-    ) -> RawQuerySet[Any]: ...
+    ) -> RawQuerySet[_T]: ...
     # The type of values may be overridden to be more specific in the mypy plugin, depending on the fields param
     def values(
         self, *fields: str | Combinable, **expressions: Any

django-stubs/db/utils.pyi

@@ -1,8 +1,7 @@
 from collections.abc import Callable, Iterable
 from types import TracebackType
-from typing import Any
+from typing import Any, ParamSpec, TypeVar
 from typing import Any as Incomplete
-from typing import ParamSpec, TypeVar
 
 from django.apps import AppConfig
 from django.db.backends.base.base import BaseDatabaseWrapper