diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-11-30 14:04:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-11-30 14:04:34 +0000 |
| commit | 1057b47bca2522e45d9621a709d033aa4fb88888 (patch) | |
| tree | 4ca4cd649b2f4f5f068051a7c2d74815e9d52f1a /lib/sqlalchemy/orm/relationships.py | |
| parent | 7857a1de32169858367446d11089c34f8daee957 (diff) | |
| parent | 3e3e3ab0d46b8912649afc7c3eb63b76c19d93fe (diff) | |
| download | sqlalchemy-1057b47bca2522e45d9621a709d033aa4fb88888.tar.gz | |
Merge "annotated / DC forms for association proxy" into main
Diffstat (limited to 'lib/sqlalchemy/orm/relationships.py')
| -rw-r--r-- | lib/sqlalchemy/orm/relationships.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py index 443801b32..73d11e880 100644 --- a/lib/sqlalchemy/orm/relationships.py +++ b/lib/sqlalchemy/orm/relationships.py @@ -160,6 +160,9 @@ _LazyLoadArgumentType = Literal[ _RelationshipJoinConditionArgument = Union[ str, _ColumnExpressionArgument[bool] ] +_RelationshipSecondaryArgument = Union[ + "FromClause", str, Callable[[], "FromClause"] +] _ORMOrderByArgument = Union[ Literal[False], str, @@ -269,7 +272,7 @@ class _RelationshipArgs(NamedTuple): """ secondary: _RelationshipArg[ - Optional[Union[FromClause, str]], + Optional[_RelationshipSecondaryArgument], Optional[FromClause], ] primaryjoin: _RelationshipArg[ @@ -352,7 +355,7 @@ class RelationshipProperty( def __init__( self, argument: Optional[_RelationshipArgumentType[_T]] = None, - secondary: Optional[Union[FromClause, str]] = None, + secondary: Optional[_RelationshipSecondaryArgument] = None, *, uselist: Optional[bool] = None, collection_class: Optional[ |