allow overriding env variable

teksi · Sep 30, 2024 · 1d76895 · 1d76895
1 parent 5a69a78
commit 1d76895
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/plugin/teksi_wastewater/interlis/utils/various.py b/plugin/teksi_wastewater/interlis/utils/various.py
@@ -5,7 +5,7 @@
 import tempfile
 import uuid
 from typing import List
-
+from qgis.core import QgsExpression
 from ...utils.database_utils import DatabaseUtils
 from ...utils.plugin_utils import logger
 
@@ -60,7 +60,10 @@ def get_pgconf_as_ili_args() -> List[str]:
                 f.write(param + "\n")
         args.extend(["--dbparams", '"' + os.path.join(dbparams_path, "dbparams.txt") + '"'])
     if not pgconf["user"]:
-        args.extend(["--dbusr", '"' + os.getenv("USERNAME") + '"'])
+        # allow loading PGUSER from overriden env variables
+        expression = QgsExpression('@PGUSER')
+        pguser = expression.evaluate()
+        args.extend(["--dbusr", f'"{pguser}"'])
     return args