diff options
| -rw-r--r-- | doc/build/changelog/unreleased_20/9669.rst | 7 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/attributes.py | 2 | ||||
| -rw-r--r-- | test/ext/mypy/plain_files/orm_querying.py | 38 |
3 files changed, 46 insertions, 1 deletions
diff --git a/doc/build/changelog/unreleased_20/9669.rst b/doc/build/changelog/unreleased_20/9669.rst new file mode 100644 index 000000000..1ab9b071c --- /dev/null +++ b/doc/build/changelog/unreleased_20/9669.rst @@ -0,0 +1,7 @@ +.. change:: + :tags: bug, typing + :tickets: 9669 + + Fixed typing issue where :meth:`_orm.PropComparator.and_` expressions would + not be correctly typed inside of loader options such as + :func:`_orm.selectinload`. diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index 3a60eda4f..69ddd3388 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -405,7 +405,7 @@ class QueryableAttribute( def and_( self, *clauses: _ColumnExpressionArgument[bool] - ) -> interfaces.PropComparator[bool]: + ) -> QueryableAttribute[bool]: if TYPE_CHECKING: assert isinstance(self.comparator, RelationshipProperty.Comparator) diff --git a/test/ext/mypy/plain_files/orm_querying.py b/test/ext/mypy/plain_files/orm_querying.py new file mode 100644 index 000000000..6bde850aa --- /dev/null +++ b/test/ext/mypy/plain_files/orm_querying.py @@ -0,0 +1,38 @@ +from __future__ import annotations + +from sqlalchemy import ForeignKey +from sqlalchemy import select +from sqlalchemy.orm import aliased +from sqlalchemy.orm import DeclarativeBase +from sqlalchemy.orm import Mapped +from sqlalchemy.orm import mapped_column +from sqlalchemy.orm import relationship +from sqlalchemy.orm import selectinload + + +class Base(DeclarativeBase): + pass + + +class A(Base): + __tablename__ = "a" + + id: Mapped[int] = mapped_column(primary_key=True) + data: Mapped[str] + bs: Mapped[list[B]] = relationship("B") + + +class B(Base): + __tablename__ = "b" + id: Mapped[int] = mapped_column(primary_key=True) + a_id: Mapped[int] = mapped_column(ForeignKey("a.id")) + data: Mapped[str] + + +def test_9669_and() -> None: + select(A).options(selectinload(A.bs.and_(B.data == "some data"))) + + +def test_9669_of_type() -> None: + ba = aliased(B) + select(A).options(selectinload(A.bs.of_type(ba))) |
