also switch legacy tokenizer to new street/place choice behaviour

[nominatim.git] / nominatim / typing.py

diff --git a/nominatim/typing.py b/nominatim/typing.py
index 1946c1a6e1809341dab9ba7ed5505331b2a2886e..d988fe04a3e3d56fb4af801fa4f3cb076c685a4e 100644 (file)
--- a/nominatim/typing.py
+++ b/nominatim/typing.py
@@ -63,8 +63,10 @@ else:
     TypeAlias = str
 
 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]'
-SaTable: TypeAlias = 'sa.Table[Any]'
-SaClause: TypeAlias = 'sa.ClauseElement[Any]'
+SaFromClause: TypeAlias = 'sa.FromClause'
+SaSelectable: TypeAlias = 'sa.Selectable'