Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / api / connection.py

diff --git a/nominatim/api/connection.py b/nominatim/api/connection.py
index 79a5e3470d7b43340500aaa64c8739986e3467d4..efa4490e0cbf6d263398a4cf21d2f883b419bad9 100644 (file)
--- a/nominatim/api/connection.py
+++ b/nominatim/api/connection.py
@@ -13,6 +13,7 @@ import sqlalchemy as sa
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from nominatim.db.sqlalchemy_schema import SearchTables
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from nominatim.db.sqlalchemy_schema import SearchTables

+from nominatim.api.logging import log

 
 class SearchConnection:
     """ An extended SQLAlchemy connection class, that also contains
 
 class SearchConnection:
     """ An extended SQLAlchemy connection class, that also contains


@@ -34,14 +35,16 @@ class SearchConnection:
                     ) -> Any:
         """ Execute a 'scalar()' query on the connection.
         """
                     ) -> Any:
         """ Execute a 'scalar()' query on the connection.
         """

+        log().sql(self.connection, sql)

         return await self.connection.scalar(sql, params)
 
 
         return await self.connection.scalar(sql, params)
 
 

-    async def execute(self, sql: sa.sql.base.Executable,
+    async def execute(self, sql: 'sa.Executable',

                       params: Union[Mapping[str, Any], Sequence[Mapping[str, Any]], None] = None
                       params: Union[Mapping[str, Any], Sequence[Mapping[str, Any]], None] = None

-                     ) -> 'sa.engine.Result[Any]':
+                     ) -> 'sa.Result[Any]':

         """ Execute a 'execute()' query on the connection.
         """
         """ Execute a 'execute()' query on the connection.
         """

+        log().sql(self.connection, sql)

         return await self.connection.execute(sql, params)
 
 
         return await self.connection.execute(sql, params)