Skip to content

Commit b0858a7

Browse files
authored
Fix Any value for schemea (#2124)
1 parent 17401ca commit b0858a7

File tree

7 files changed

+50
-32
lines changed

7 files changed

+50
-32
lines changed

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

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ from logging import Logger
22
from typing import Any
33

44
from django.db.backends.mysql.schema import DatabaseSchemaEditor
5+
from django.db.models.base import Model
6+
from django.db.models.fields import Field
57

68
logger: Logger
79

@@ -10,9 +12,11 @@ class MySQLGISSchemaEditor(DatabaseSchemaEditor):
1012
sql_drop_spatial_index: str
1113
geometry_sql: Any
1214
def __init__(self, *args: Any, **kwargs: Any) -> None: ...
13-
def skip_default(self, field: Any) -> Any: ...
14-
def column_sql(self, model: Any, field: Any, include_default: bool = ...) -> Any: ...
15-
def create_model(self, model: Any) -> None: ...
16-
def add_field(self, model: Any, field: Any) -> None: ...
17-
def remove_field(self, model: Any, field: Any) -> None: ...
15+
def skip_default(self, field: Field) -> bool: ...
16+
def column_sql(
17+
self, model: type[Model], field: Field, include_default: bool = ...
18+
) -> tuple[None, None] | tuple[str, list[Any]]: ...
19+
def create_model(self, model: type[Model]) -> None: ...
20+
def add_field(self, model: type[Model], field: Field) -> None: ...
21+
def remove_field(self, model: type[Model], field: Field) -> None: ...
1822
def create_spatial_indexes(self) -> None: ...
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from typing import Any
22

33
from django.db.backends.oracle.schema import DatabaseSchemaEditor
4+
from django.db.models.base import Model
5+
from django.db.models.fields import Field
46

57
class OracleGISSchemaEditor(DatabaseSchemaEditor):
68
sql_add_geometry_metadata: str
@@ -11,9 +13,11 @@ class OracleGISSchemaEditor(DatabaseSchemaEditor):
1113
geometry_sql: Any
1214
def __init__(self, *args: Any, **kwargs: Any) -> None: ...
1315
def geo_quote_name(self, name: Any) -> Any: ...
14-
def column_sql(self, model: Any, field: Any, include_default: bool = ...) -> Any: ...
15-
def create_model(self, model: Any) -> None: ...
16-
def delete_model(self, model: Any) -> None: ...
17-
def add_field(self, model: Any, field: Any) -> None: ...
18-
def remove_field(self, model: Any, field: Any) -> None: ...
16+
def column_sql(
17+
self, model: type[Model], field: Field, include_default: bool = ...
18+
) -> tuple[None, None] | tuple[str, list[Any]]: ...
19+
def create_model(self, model: type[Model]) -> None: ...
20+
def delete_model(self, model: type[Model]) -> None: ...
21+
def add_field(self, model: type[Model], field: Field) -> None: ...
22+
def remove_field(self, model: type[Model], field: Field) -> None: ...
1923
def run_geometry_sql(self) -> None: ...
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from typing import Any
22

33
from django.db.backends.sqlite3.schema import DatabaseSchemaEditor
4+
from django.db.models.base import Model
5+
from django.db.models.fields import Field
46

57
class SpatialiteSchemaEditor(DatabaseSchemaEditor):
68
sql_add_geometry_column: str
@@ -14,15 +16,17 @@ class SpatialiteSchemaEditor(DatabaseSchemaEditor):
1416
geometry_sql: Any
1517
def __init__(self, *args: Any, **kwargs: Any) -> None: ...
1618
def geo_quote_name(self, name: Any) -> Any: ...
17-
def column_sql(self, model: Any, field: Any, include_default: bool = ...) -> Any: ...
18-
def remove_geometry_metadata(self, model: Any, field: Any) -> None: ...
19-
def create_model(self, model: Any) -> None: ...
20-
def delete_model(self, model: Any, **kwargs: Any) -> None: ...
21-
def add_field(self, model: Any, field: Any) -> None: ...
22-
def remove_field(self, model: Any, field: Any) -> None: ...
19+
def column_sql(
20+
self, model: type[Model], field: Field, include_default: bool = ...
21+
) -> tuple[None, None] | tuple[str, list[Any]]: ...
22+
def remove_geometry_metadata(self, model: type[Model], field: Field) -> None: ...
23+
def create_model(self, model: type[Model]) -> None: ...
24+
def delete_model(self, model: type[Model], **kwargs: Any) -> None: ...
25+
def add_field(self, model: type[Model], field: Field) -> None: ...
26+
def remove_field(self, model: type[Model], field: Field) -> None: ...
2327
def alter_db_table(
2428
self,
25-
model: Any,
26-
old_db_table: Any,
27-
new_db_table: Any,
29+
model: type[Model],
30+
old_db_table: str,
31+
new_db_table: str,
2832
) -> None: ...

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ class BaseDatabaseSchemaEditor(AbstractContextManager[Any]):
7474
def column_sql(
7575
self, model: type[Model], field: Field, include_default: bool = ...
7676
) -> tuple[None, None] | tuple[str, list[Any]]: ...
77-
def skip_default(self, field: Any) -> bool: ...
78-
def skip_default_on_alter(self, field: Any) -> bool: ...
77+
def skip_default(self, field: Field) -> bool: ...
78+
def skip_default_on_alter(self, field: Field) -> bool: ...
7979
def prepare_default(self, value: Any) -> Any: ...
8080
def db_default_sql(self, field: Field) -> _AsSqlType: ...
8181
def effective_default(self, field: Field) -> int | str: ...
@@ -101,10 +101,10 @@ class BaseDatabaseSchemaEditor(AbstractContextManager[Any]):
101101
) -> None: ...
102102
def alter_db_table(self, model: type[Model], old_db_table: str, new_db_table: str) -> None: ...
103103
def alter_db_table_comment(
104-
self, model: type[Model], old_db_table_comment: str | None, new_db_table_comment: str
104+
self, model: type[Model], old_db_table_comment: str, new_db_table_comment: str
105105
) -> None: ...
106-
def alter_db_tablespace(self, model: Any, old_db_tablespace: Any, new_db_tablespace: Any) -> None: ...
107-
def add_field(self, model: Any, field: Any) -> None: ...
108-
def remove_field(self, model: Any, field: Any) -> None: ...
106+
def alter_db_tablespace(self, model: type[Model], old_db_tablespace: str, new_db_tablespace: str) -> None: ...
107+
def add_field(self, model: type[Model], field: Field) -> None: ...
108+
def remove_field(self, model: type[Model], field: Field) -> None: ...
109109
def alter_field(self, model: type[Model], old_field: Field, new_field: Field, strict: bool = ...) -> None: ...
110110
def remove_procedure(self, procedure_name: Any, param_types: Any = ...) -> None: ...

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ from typing import Any
22

33
from django.db.backends.base.schema import BaseDatabaseSchemaEditor
44
from django.db.backends.mysql.base import DatabaseWrapper
5+
from django.db.models.base import Model
6+
from django.db.models.fields import Field
57

68
class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
79
connection: DatabaseWrapper
@@ -22,5 +24,5 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
2224
@property
2325
def sql_rename_column(self) -> str: ... # type: ignore[override]
2426
def quote_value(self, value: Any) -> str: ...
25-
def skip_default(self, field: Any) -> bool: ...
26-
def add_field(self, model: Any, field: Any) -> None: ...
27+
def skip_default(self, field: Field) -> bool: ...
28+
def add_field(self, model: type[Model], field: Field) -> None: ...

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ from typing import Any
22

33
from django.db.backends.base.schema import BaseDatabaseSchemaEditor
44
from django.db.backends.oracle.base import DatabaseWrapper
5+
from django.db.models.base import Model
6+
from django.db.models.fields import Field
57

68
class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
79
connection: DatabaseWrapper
@@ -16,8 +18,8 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
1618
sql_delete_table: str
1719
sql_create_index: str
1820
def quote_value(self, value: Any) -> str: ...
19-
def remove_field(self, model: Any, field: Any) -> None: ...
20-
def delete_model(self, model: Any) -> None: ...
21-
def alter_field(self, model: Any, old_field: Any, new_field: Any, strict: bool = ...) -> None: ...
21+
def remove_field(self, model: type[Model], field: Field) -> None: ...
22+
def delete_model(self, model: type[Model]) -> None: ...
23+
def alter_field(self, model: type[Model], old_field: Field, new_field: Field, strict: bool = ...) -> None: ...
2224
def normalize_name(self, name: Any) -> str: ...
2325
def prepare_default(self, value: Any) -> Any: ...

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ from typing import Any
22

33
from django.db.backends.base.schema import BaseDatabaseSchemaEditor
44
from django.db.backends.postgresql.base import DatabaseWrapper
5+
from django.db.models.base import Model
6+
from django.db.models.indexes import Index
57

68
class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
79
connection: DatabaseWrapper
@@ -17,5 +19,5 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
1719
sql_delete_fk: str
1820
sql_delete_procedure: str
1921
def quote_value(self, value: Any) -> str: ...
20-
def add_index(self, model: Any, index: Any, concurrently: bool = ...) -> None: ...
21-
def remove_index(self, model: Any, index: Any, concurrently: bool = ...) -> None: ...
22+
def add_index(self, model: type[Model], index: Index, concurrently: bool = ...) -> None: ...
23+
def remove_index(self, model: type[Model], index: Index, concurrently: bool = ...) -> None: ...

0 commit comments

Comments
 (0)