ignore very long ways

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

diff --git a/nominatim/db/connection.py b/nominatim/db/connection.py
index 12fc22d46841486c047cf341538ff81b5413cf3f..d686083697f03d03bec86ed061e509884a9905b2 100644 (file)
--- a/nominatim/db/connection.py
+++ b/nominatim/db/connection.py
@@ -174,22 +174,13 @@ 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.
+
+    def extension_loaded(self, extension_name: str) -> bool:
+        """ Return True if the hstore extension is loaded in the database.
         """
         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]))
+            cur.execute('SELECT extname FROM pg_extension WHERE extname = %s', (extension_name, ))
+            return cur.rowcount > 0
 
 
 class ConnectionContext(ContextManager[Connection]):
@@ -248,7 +239,7 @@ _PG_CONNECTION_STRINGS = {
 def get_pg_env(dsn: str,
                base_env: Optional[SysEnv] = None) -> Dict[str, str]:
     """ Return a copy of `base_env` with the environment variables for
-        PostgresSQL set up from the given database connection string.
+        PostgreSQL set up from the given database connection string.
         If `base_env` is None, then the OS environment is used as a base
         environment.
     """