diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2023-03-30 12:44:49 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2023-03-30 12:44:49 -0400 |
| commit | b452f989da49761c5174b299024fea3e13a05221 (patch) | |
| tree | 8aa3c31faf55e456939a167391ab8b2f17cebc75 /lib/sqlalchemy/orm | |
| parent | 72d2ec57928bdf5649c551bdaa87b7fb0943c2fe (diff) | |
| download | sqlalchemy-b452f989da49761c5174b299024fea3e13a05221.tar.gz | |
assign correct typing to deferred(), query_property()
Fixed typing for :func:`_orm.deferred` and :func:`_orm.query_expression`
to work correctly with 2.0 style mappings.
Fixes: #9536
Change-Id: Idb88c0a11b7896093234b3cc31595f64b552cba0
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/_orm_constructors.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/_orm_constructors.py b/lib/sqlalchemy/orm/_orm_constructors.py index 9f9330cea..11ed80d8c 100644 --- a/lib/sqlalchemy/orm/_orm_constructors.py +++ b/lib/sqlalchemy/orm/_orm_constructors.py @@ -24,7 +24,6 @@ from ._typing import _O from .descriptor_props import Composite from .descriptor_props import Synonym from .interfaces import _AttributeOptions -from .properties import ColumnProperty from .properties import MappedColumn from .properties import MappedSQLExpression from .query import AliasOption @@ -1971,7 +1970,7 @@ def deferred( expire_on_flush: bool = True, info: Optional[_InfoType] = None, doc: Optional[str] = None, -) -> ColumnProperty[_T]: +) -> MappedSQLExpression[_T]: r"""Indicate a column-based mapped attribute that by default will not load unless accessed. @@ -1997,7 +1996,7 @@ def deferred( :ref:`orm_queryguide_deferred_imperative` """ - return ColumnProperty( + return MappedSQLExpression( column, *additional_columns, attribute_options=_AttributeOptions( @@ -2021,7 +2020,7 @@ def query_expression( expire_on_flush: bool = True, info: Optional[_InfoType] = None, doc: Optional[str] = None, -) -> ColumnProperty[_T]: +) -> MappedSQLExpression[_T]: """Indicate an attribute that populates from a query-time SQL expression. :param default_expr: Optional SQL expression object that will be used in @@ -2034,7 +2033,7 @@ def query_expression( :ref:`orm_queryguide_with_expression` - background and usage examples """ - prop = ColumnProperty( + prop = MappedSQLExpression( default_expr, attribute_options=_AttributeOptions( _NoArg.NO_ARG, |