Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / typing.py

diff --git a/nominatim/typing.py b/nominatim/typing.py
index 07efc7bade6210114051c7765388cfb165251bc8..62ecd8c3e169ce7340dca7c6eb6a83a7881cd3d5 100644 (file)
--- a/nominatim/typing.py
+++ b/nominatim/typing.py
@@ -53,7 +53,7 @@ else:
 
 
 # SQLAlchemy introduced generic types in version 2.0 making typing
 
 
 # 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:
 # to litter the code with bare-string types.
 
 if TYPE_CHECKING:


@@ -62,7 +62,14 @@ if TYPE_CHECKING:
 else:
     TypeAlias = str
 
 else:
     TypeAlias = str
 

+SaLambdaSelect: TypeAlias = 'Union[sa.Select[Any], sa.StatementLambdaElement]'

 SaSelect: TypeAlias = 'sa.Select[Any]'
 SaSelect: TypeAlias = 'sa.Select[Any]'

+SaScalarSelect: TypeAlias = 'sa.ScalarSelect[Any]'

 SaRow: TypeAlias = 'sa.Row[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]'
 SaLabel: TypeAlias = 'sa.Label[Any]'

+SaFromClause: TypeAlias = 'sa.FromClause'
+SaSelectable: TypeAlias = 'sa.Selectable'
+SaBind: TypeAlias = 'sa.BindParameter[Any]'
+SaDialect: TypeAlias = 'sa.Dialect'