band-aid for SQLAlchemy 1.4

diff --git a/nominatim/api/logging.py b/nominatim/api/logging.py
index 8d9af10c81aceb57a2117a99ff28491b79c69665..202d7de9a5baf0abca6ed1807bfb488cb136de05 100644 (file)
--- a/nominatim/api/logging.py
+++ b/nominatim/api/logging.py
@@ -93,6 +93,14 @@ class BaseLogger:
             for k in extra_params[0]:
                 params[k] = f':{k}'
 
             for k in extra_params[0]:
                 params[k] = f':{k}'
 

+        sqlstr = str(compiled)
+
+        if '%s' in sqlstr:
+            try:
+                return sqlstr % tuple((repr(compiled.params[name]) for name in compiled.positiontup))
+            except TypeError:
+                return sqlstr
+

         return str(compiled) % params
 
 
         return str(compiled) % params
 
 

diff --git a/nominatim/db/sqlalchemy_types.py b/nominatim/db/sqlalchemy_types.py
index e34dc7c188106c8f031c6e53474264409664a324..c54d339e6d903b202ec1ad7e551ee881681c8856 100644 (file)
--- a/nominatim/db/sqlalchemy_types.py
+++ b/nominatim/db/sqlalchemy_types.py
@@ -28,7 +28,7 @@ class Geometry(types.UserDefinedType[Any]):
         return f'GEOMETRY({self.subtype}, 4326)'
 
 
         return f'GEOMETRY({self.subtype}, 4326)'
 
 

-    def bind_processor(self, dialect: sa.Dialect) -> Callable[[Any], str]:
+    def bind_processor(self, dialect: 'sa.Dialect') -> Callable[[Any], str]:

         def process(value: Any) -> str:
             if isinstance(value, str):
                 return 'SRID=4326;' + value
         def process(value: Any) -> str:
             if isinstance(value, str):
                 return 'SRID=4326;' + value


@@ -37,14 +37,14 @@ class Geometry(types.UserDefinedType[Any]):
         return process
 
 
         return process
 
 

-    def result_processor(self, dialect: sa.Dialect, coltype: object) -> Callable[[Any], str]:
+    def result_processor(self, dialect: 'sa.Dialect', coltype: object) -> Callable[[Any], str]:

         def process(value: Any) -> str:
             assert isinstance(value, str)
             return value
         return process
 
 
         def process(value: Any) -> str:
             assert isinstance(value, str)
             return value
         return process
 
 

-    def bind_expression(self, bindvalue: sa.BindParameter[Any]) -> SaColumn:
+    def bind_expression(self, bindvalue: 'sa.BindParameter[Any]') -> SaColumn:

         return sa.func.ST_GeomFromText(bindvalue, type_=self)
 
 
         return sa.func.ST_GeomFromText(bindvalue, type_=self)