X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f029fb3c656788b44fa758e627592d27014528d5..e7b8e1a2c2d82f3f31f033df17adc5d14bbc5374:/nominatim/db/connection.py diff --git a/nominatim/db/connection.py b/nominatim/db/connection.py index a64cbfaf..12fc22d4 100644 --- a/nominatim/db/connection.py +++ b/nominatim/db/connection.py @@ -31,7 +31,7 @@ class Cursor(psycopg2.extras.DictCursor): """ Query execution that logs the SQL query when debugging is enabled. """ if LOG.isEnabledFor(logging.DEBUG): - LOG.debug(self.mogrify(query, args).decode('utf-8')) # type: ignore[arg-type] + LOG.debug(self.mogrify(query, args).decode('utf-8')) super().execute(query, args) @@ -174,6 +174,24 @@ class Connection(psycopg2.extensions.connection): return (int(version_parts[0]), int(version_parts[1])) + def hstore_version_tuple(self) -> Tuple[int, int]: + """ Return the hstore version installed in the database as a + tuple of (major, minor). Assumes that the hstore extension + has been installed already. + """ + with self.cursor() as cur: + version = cur.scalar( + 'SELECT extversion FROM pg_extension WHERE extname = %s', + ('hstore') + ) + + version_parts = version.split('.') + if len(version_parts) < 2: + raise UsageError(f"Error fetching hstore version. Bad format: {version}") + + return (int(version_parts[0]), int(version_parts[1])) + + class ConnectionContext(ContextManager[Connection]): """ Context manager of the connection that also provides direct access to the underlying connection.