actions: add test for database migration

[nominatim.git] / src / nominatim_db / config.py

diff --git a/src/nominatim_db/config.py b/src/nominatim_db/config.py
index 5ae3dea3b3ea8b14dfef655c0edf45e31aab6bdf..b220b5c7844ab7ef20756d68c9e8e0033e47ec72 100644 (file)
--- a/src/nominatim_db/config.py
+++ b/src/nominatim_db/config.py
@@ -59,20 +59,20 @@ class Configuration:
         other than string.
     """
 
         other than string.
     """
 

-    def __init__(self, project_dir: Optional[Path],
+    def __init__(self, project_dir: Optional[Union[Path, str]],

                  environ: Optional[Mapping[str, str]] = None) -> None:
                  environ: Optional[Mapping[str, str]] = None) -> None:

-        self.environ = environ or os.environ
-        self.project_dir = project_dir
+        self.environ = os.environ if environ is None else environ

         self.config_dir = paths.CONFIG_DIR
         self._config = dotenv_values(str(self.config_dir / 'env.defaults'))
         self.config_dir = paths.CONFIG_DIR
         self._config = dotenv_values(str(self.config_dir / 'env.defaults'))

-        if self.project_dir is not None and (self.project_dir / '.env').is_file():
-            self.project_dir = self.project_dir.resolve()
-            self._config.update(dotenv_values(str(self.project_dir / '.env')))
+        if project_dir is not None:
+            self.project_dir: Optional[Path] = Path(project_dir).resolve()
+            if (self.project_dir / '.env').is_file():
+                self._config.update(dotenv_values(str(self.project_dir / '.env')))
+        else:
+            self.project_dir = None

 
         class _LibDirs:
 
         class _LibDirs:

-            module: Path

             osm2pgsql: Path
             osm2pgsql: Path

-            php = paths.PHPLIB_DIR

             sql = paths.SQLLIB_DIR
             data = paths.DATA_DIR
 
             sql = paths.SQLLIB_DIR
             data = paths.DATA_DIR