X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0cdbb97f6a4953971d60a46ddabc5df24be5f8ad..f71478e49c1a9462ca3b94a72d280581d98b8fff:/nominatim/config.py diff --git a/nominatim/config.py b/nominatim/config.py index e0f19b04..3a4c3a6b 100644 --- a/nominatim/config.py +++ b/nominatim/config.py @@ -17,6 +17,7 @@ import json import yaml from dotenv import dotenv_values +from psycopg2.extensions import parse_dsn from nominatim.typing import StrPath from nominatim.errors import UsageError @@ -51,7 +52,7 @@ class Configuration: Nominatim uses dotenv to configure the software. Configuration options are resolved in the following order: - * from the OS environment (or the dirctionary given in `environ` + * from the OS environment (or the dictionary given in `environ`) * from the .env file in the project directory of the installation * from the default installation in the configuration directory @@ -164,6 +165,18 @@ class Configuration: return dsn + def get_database_params(self) -> Mapping[str, str]: + """ Get the configured parameters for the database connection + as a mapping. + """ + dsn = self.DATABASE_DSN + + if dsn.startswith('pgsql:'): + return dict((p.split('=', 1) for p in dsn[6:].split(';'))) + + return parse_dsn(dsn) + + def get_import_style_file(self) -> Path: """ Return the import style file as a path object. Translates the name of the standard styles automatically into a file in the