From 9cb9b670d182932851613ac8a08d3a1e7c8ce51f Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 6 Jul 2023 09:29:20 +0200 Subject: [PATCH] add support for postcompile literals in debug output --- nominatim/api/logging.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nominatim/api/logging.py b/nominatim/api/logging.py index 37855790..d4dc68b7 100644 --- a/nominatim/api/logging.py +++ b/nominatim/api/logging.py @@ -99,6 +99,7 @@ class BaseLogger: if sa.__version__.startswith('1'): try: + sqlstr = re.sub(r'__\[POSTCOMPILE_[^]]*\]', '%s', sqlstr) return sqlstr % tuple((repr(params.get(name, None)) for name in compiled.positiontup)) # type: ignore except TypeError: @@ -107,9 +108,10 @@ class BaseLogger: # Fixes an odd issue with Python 3.7 where percentages are not # quoted correctly. sqlstr = re.sub(r'%(?!\()', '%%', sqlstr) + sqlstr = re.sub(r'__\[POSTCOMPILE_([^]]*)\]', r'%(\1)s', sqlstr) + print(sqlstr) return sqlstr % params - class HTMLLogger(BaseLogger): """ Logger that formats messages in HTML. """ -- 2.39.5