summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2022-11-15 18:14:24 +0000
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>2022-11-15 18:14:24 +0000
commite723db6c46aa5a24681bef349b97c287dc74de8f (patch)
tree2ff1a76cb68d2bf4a4fd26dbe529a7aed3243a70 /lib/sqlalchemy/orm
parent36954a3dbb3a528d81c24db6b8698ba1e48d7cb2 (diff)
parent2fdfb5527ee0fe55d094f474951db7997b7b5422 (diff)
downloadsqlalchemy-e723db6c46aa5a24681bef349b97c287dc74de8f.tar.gz
Merge "Fix relationship.order_by typing" into main
Diffstat (limited to 'lib/sqlalchemy/orm')
-rw-r--r--lib/sqlalchemy/orm/relationships.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py
index e0922a538..986093e02 100644
--- a/lib/sqlalchemy/orm/relationships.py
+++ b/lib/sqlalchemy/orm/relationships.py
@@ -164,6 +164,7 @@ _ORMOrderByArgument = Union[
Literal[False],
str,
_ColumnExpressionArgument[Any],
+ Callable[[], Iterable[ColumnElement[Any]]],
Iterable[Union[str, _ColumnExpressionArgument[Any]]],
]
_ORMBackrefArgument = Union[str, Tuple[str, Dict[str, Any]]]