Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / typing.py

diff --git a/nominatim/typing.py b/nominatim/typing.py
index bc4c5534777e537a3d0ffe1ab4a0c6d2b16f2456..7274f1d396f8159b714c80fff14fd25b3455b345 100644 (file)
--- a/nominatim/typing.py
+++ b/nominatim/typing.py
@@ -62,9 +62,13 @@ 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]'
 SaColumn: TypeAlias = 'sa.ColumnElement[Any]'
 SaRow: TypeAlias = 'sa.Row[Any]'
 SaColumn: TypeAlias = 'sa.ColumnElement[Any]'

+SaExpression: TypeAlias = 'sa.ColumnElement[bool]'

 SaLabel: TypeAlias = 'sa.Label[Any]'
 SaFromClause: TypeAlias = 'sa.FromClause'
 SaSelectable: TypeAlias = 'sa.Selectable'
 SaLabel: TypeAlias = 'sa.Label[Any]'
 SaFromClause: TypeAlias = 'sa.FromClause'
 SaSelectable: TypeAlias = 'sa.Selectable'

+SaBind: TypeAlias = 'sa.BindParameter[Any]'