diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2023-01-26 18:39:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2023-01-26 18:39:08 +0000 |
| commit | 19cbf8038f4a9e8e0820bcfeb6b65bf5bc873d39 (patch) | |
| tree | 034eb4b5483a9854efdaa820b48d4241b1a73a2e /lib | |
| parent | 9b80df875f319d3d6072534b7d7d588a45ee5026 (diff) | |
| parent | f129645b3f54af924ef37f0d092f17fc8a532fb3 (diff) | |
| download | sqlalchemy-19cbf8038f4a9e8e0820bcfeb6b65bf5bc873d39.tar.gz | |
Merge "add Mapped to _ORMColCollectionElement" into main
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/orm/relationships.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py index 66d3a6035..05fa17a96 100644 --- a/lib/sqlalchemy/orm/relationships.py +++ b/lib/sqlalchemy/orm/relationships.py @@ -175,7 +175,7 @@ _ORMOrderByArgument = Union[ ORMBackrefArgument = Union[str, Tuple[str, Dict[str, Any]]] _ORMColCollectionElement = Union[ - ColumnClause[Any], _HasClauseElement, roles.DMLColumnRole + ColumnClause[Any], _HasClauseElement, roles.DMLColumnRole, "Mapped[Any]" ] _ORMColCollectionArgument = Union[ str, |