X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/df65c10360344f2deb01bbe0536c8b2bc1657fb4..afb439b089efd45a5393be8eb0c3e8877f1ff7a7:/nominatim/typing.py diff --git a/nominatim/typing.py b/nominatim/typing.py index 07efc7ba..7274f1d3 100644 --- a/nominatim/typing.py +++ b/nominatim/typing.py @@ -53,7 +53,7 @@ else: # SQLAlchemy introduced generic types in version 2.0 making typing -# inclompatiple with older versions. Add wrappers here so we don't have +# incompatible with older versions. Add wrappers here so we don't have # to litter the code with bare-string types. if TYPE_CHECKING: @@ -62,7 +62,13 @@ if TYPE_CHECKING: else: TypeAlias = str +SaLambdaSelect: TypeAlias = 'Union[sa.Select[Any], sa.StatementLambdaElement]' SaSelect: TypeAlias = 'sa.Select[Any]' +SaScalarSelect: TypeAlias = 'sa.ScalarSelect[Any]' SaRow: TypeAlias = 'sa.Row[Any]' -SaColumn: TypeAlias = 'sa.Column[Any]' +SaColumn: TypeAlias = 'sa.ColumnElement[Any]' +SaExpression: TypeAlias = 'sa.ColumnElement[bool]' SaLabel: TypeAlias = 'sa.Label[Any]' +SaFromClause: TypeAlias = 'sa.FromClause' +SaSelectable: TypeAlias = 'sa.Selectable' +SaBind: TypeAlias = 'sa.BindParameter[Any]'