Skip to content

Commit 897617a

Browse files
authored
Improve database-related check signatures (#2994)
1 parent e297573 commit 897617a

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
from typing import Any
22

3+
from django.core.checks.messages import CheckMessage
34
from django.db.backends.base.base import BaseDatabaseWrapper
45
from django.db.models.fields import Field
56

67
class BaseDatabaseValidation:
78
connection: BaseDatabaseWrapper
89
def __init__(self, connection: BaseDatabaseWrapper) -> None: ...
910
def __del__(self) -> None: ...
10-
def check(self, **kwargs: Any) -> list[Any]: ...
11-
def check_field(self, field: Field, **kwargs: Any) -> list[Any]: ...
11+
def check(self, **kwargs: Any) -> list[CheckMessage]: ...
12+
def check_field(self, field: Field, **kwargs: Any) -> list[CheckMessage]: ...
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
from typing import Any
22

3+
from django.core.checks.messages import CheckMessage
34
from django.db.backends.base.validation import BaseDatabaseValidation
45
from django.db.backends.mysql.base import DatabaseWrapper
6+
from django.db.models.fields import Field
57

68
class DatabaseValidation(BaseDatabaseValidation):
79
connection: DatabaseWrapper
8-
def check(self, **kwargs: Any) -> Any: ...
9-
def check_field_type(self, field: Any, field_type: Any) -> Any: ...
10+
def check(self, **kwargs: Any) -> list[CheckMessage]: ...
11+
def check_field_type(self, field: Field, field_type: str) -> list[CheckMessage]: ...
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from typing import Any
2-
1+
from django.core.checks.messages import CheckMessage
32
from django.db.backends.base.validation import BaseDatabaseValidation
43
from django.db.backends.oracle.base import DatabaseWrapper
4+
from django.db.models.fields import Field
55

66
class DatabaseValidation(BaseDatabaseValidation):
77
connection: DatabaseWrapper
8-
def check_field_type(self, field: Any, field_type: Any) -> Any: ...
8+
def check_field_type(self, field: Field, field_type: str) -> list[CheckMessage]: ...

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from typing import Any
22

3+
from django.core.checks.messages import CheckMessage
34
from django.db.models.base import Model
45
from django.utils.functional import cached_property
56
from typing_extensions import deprecated
@@ -17,4 +18,4 @@ class FieldCacheMixin:
1718
def delete_cached_value(self, instance: Model) -> None: ...
1819

1920
class CheckFieldDefaultMixin:
20-
def check(self, **kwargs: Any) -> Any: ...
21+
def check(self, **kwargs: Any) -> list[CheckMessage]: ...

django-stubs/db/models/manager.pyi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import datetime
22
from collections.abc import AsyncIterator, Collection, Iterable, Iterator, Mapping, Sequence
33
from typing import Any, Generic, Literal, NoReturn, TypeVar, overload
44

5+
from django.core.checks.messages import CheckMessage
56
from django.db.models.base import Model
67
from django.db.models.expressions import Combinable, OrderBy
78
from django.db.models.query import Prefetch, QuerySet, RawQuerySet, _LookupT, _PrefetchedQuerySetT, _ToAttrT
@@ -22,7 +23,7 @@ class BaseManager(Generic[_T]):
2223
def deconstruct(
2324
self,
2425
) -> tuple[bool, str | None, str | None, Sequence[Any] | None, dict[str, Any] | None]: ...
25-
def check(self, **kwargs: Any) -> list[Any]: ...
26+
def check(self, **kwargs: Any) -> list[CheckMessage]: ...
2627
@classmethod
2728
def from_queryset(cls, queryset_class: type[QuerySet[_T]], class_name: str | None = None) -> type[Self]: ...
2829
@classmethod

0 commit comments

Comments
 (0)