X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/673c3c7a556d90f5168ed815bf775b1eb9b5a532..49e0d83d5d8e3008373ae99ae3f37788f4b9a80a:/nominatim/api/logging.py

diff --git a/nominatim/api/logging.py b/nominatim/api/logging.py
index 202d7de9..3160ede8 100644
--- a/nominatim/api/logging.py
+++ b/nominatim/api/logging.py
@@ -80,7 +80,8 @@ class BaseLogger:
         """
 
     def format_sql(self, conn: AsyncConnection, statement: 'sa.Executable',
-                   extra_params: Union[Mapping[str, Any], Sequence[Mapping[str, Any]], None]) -> str:
+                   extra_params: Union[Mapping[str, Any],
+                                 Sequence[Mapping[str, Any]], None]) -> str:
         """ Return the comiled version of the statement.
         """
         compiled = cast('sa.ClauseElement', statement).compile(conn.sync_engine)
@@ -95,13 +96,14 @@ class BaseLogger:
 
         sqlstr = str(compiled)
 
-        if '%s' in sqlstr:
+        if sa.__version__.startswith('1'):
             try:
-                return sqlstr % tuple((repr(compiled.params[name]) for name in compiled.positiontup))
+                return sqlstr % tuple((repr(params.get(name, None))
+                                      for name in compiled.positiontup)) # type: ignore
             except TypeError:
                 return sqlstr
 
-        return str(compiled) % params
+        return sqlstr % params
 
 
 class HTMLLogger(BaseLogger):