hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

port code to psycopg3

Browse Source
This commit is contained in:
Sarah Hoffmann
2024-07-05 10:43:10 +02:00
parent 3742fa2929
commit 9659afbade
57 changed files with 800 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nominatim_db/config.py
View File

@@ -7,7 +7,7 @@
"""
Nominatim configuration accessor.
"""
from typing import Dict, Any, List, Mapping, Optional
from typing import Union, Dict, Any, List, Mapping, Optional
import importlib.util
import logging
import os
@@ -18,10 +18,7 @@ import yaml
from dotenv import dotenv_values
try:
from psycopg2.extensions import parse_dsn
except ModuleNotFoundError:
from psycopg.conninfo import conninfo_to_dict as parse_dsn # type: ignore[assignment]
from psycopg.conninfo import conninfo_to_dict
from .typing import StrPath
from .errors import UsageError
@@ -198,7 +195,7 @@ class Configuration:
return dsn
def get_database_params(self) -> Mapping[str, str]:
def get_database_params(self) -> Mapping[str, Union[str, int, None]]:
""" Get the configured parameters for the database connection
as a mapping.
"""
@@ -207,7 +204,7 @@ class Configuration:
if dsn.startswith('pgsql:'):
return dict((p.split('=', 1) for p in dsn[6:].split(';')))
return parse_dsn(dsn)
return conninfo_to_dict(dsn)
def get_import_style_file(self) -> Path: