diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-10-20 13:20:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-10-20 13:20:34 +0000 |
| commit | 7945ce44317869630f210c9afbbc2f44dfc4b821 (patch) | |
| tree | 416a87287da0c5e4e05fcb4fa0ccf574f8efba5e /lib/sqlalchemy | |
| parent | 05d5f90d184494782d3ed6a24f6dd6b48bb31946 (diff) | |
| parent | 4e8777b03f194ff0012bdd32fabd8a398a93687b (diff) | |
| download | sqlalchemy-7945ce44317869630f210c9afbbc2f44dfc4b821.tar.gz | |
Merge "Improve typing of DeclarativeBase" into main
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/decl_api.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/properties.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/decl_api.py b/lib/sqlalchemy/orm/decl_api.py index a43b59a45..e4a89cc80 100644 --- a/lib/sqlalchemy/orm/decl_api.py +++ b/lib/sqlalchemy/orm/decl_api.py @@ -684,7 +684,11 @@ class DeclarativeBase( __mapper__: ClassVar[Mapper[Any]] __table__: ClassVar[Optional[FromClause]] - __tablename__: ClassVar[Any] + # pyright/pylance do not consider a classmethod a ClassVar so use Any + # https://github.com/microsoft/pylance-release/issues/3484 + __tablename__: Any + __mapper_args__: Any + __table_args__: Any def __init__(self, **kw: Any): ... diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py index 841f29d15..c67da3905 100644 --- a/lib/sqlalchemy/orm/properties.py +++ b/lib/sqlalchemy/orm/properties.py @@ -48,6 +48,7 @@ from ..sql import roles from ..sql import sqltypes from ..sql.base import _NoArg from ..sql.elements import SQLCoreOperations +from ..sql.roles import DDLConstraintColumnRole from ..sql.schema import Column from ..sql.schema import SchemaConst from ..util.typing import de_optionalize_union_types @@ -499,6 +500,7 @@ class MappedSQLExpression(ColumnProperty[_T], _DeclarativeMapped[_T]): class MappedColumn( + DDLConstraintColumnRole, SQLCoreOperations[_T], _IntrospectsAnnotations, _MapsColumns[_T], |