Skip to content

Commit 847322f

Browse files
committed
💥 revert(sqla)!: Model as pydantic dataclass
1 parent dded41a commit 847322f

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

nonebot_plugin_orm/model.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
import sys
44
from inspect import Parameter, Signature
5-
from typing import TYPE_CHECKING, Any, Callable, ClassVar, cast
5+
from typing import TYPE_CHECKING, Any, ClassVar
66

77
from sqlalchemy import Table, MetaData
8-
from pydantic.dataclasses import dataclass
98
from nonebot import get_plugin_by_module_name
109
from pydantic.typing import get_args, get_origin
11-
from sqlalchemy.orm import Mapped, DeclarativeBase, MappedAsDataclass
10+
from sqlalchemy.orm import Mapped, DeclarativeBase
1211

1312
from .utils import DependsInner, get_annotations
1413

@@ -29,23 +28,19 @@
2928
}
3029

3130

32-
class Model(
33-
MappedAsDataclass,
34-
DeclarativeBase,
35-
dataclass_callable=cast(Callable[..., type], dataclass),
36-
):
31+
class Model(DeclarativeBase):
3732
metadata = MetaData(naming_convention=NAMING_CONVENTION)
3833

3934
if TYPE_CHECKING:
40-
__signature__: Signature
41-
__table__: ClassVar[Table]
4235
__bind_key__: ClassVar[str]
36+
__signature__: ClassVar[Signature]
37+
__table__: ClassVar[Table]
4338

44-
def __init_subclass__(cls) -> None:
39+
def __init_subclass__(cls, **kwargs) -> None:
4540
_setup_di(cls)
4641
_setup_tablename(cls)
4742

48-
super().__init_subclass__()
43+
super().__init_subclass__(**kwargs)
4944

5045
if not hasattr(cls, "__table__"):
5146
return

0 commit comments

Comments
 (0)