Merge pull request #119 from opengisch/fixkerb

don't set None when no fallback user active
opengisch · Nov 13, 2024 · 8240c1e · 8240c1e
2 parents eac8ec9 + 00e9304
commit 8240c1e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modelbaker/db_factory/pg_command_config_manager.py b/modelbaker/db_factory/pg_command_config_manager.py
@@ -100,7 +100,10 @@ def get_uri(
                 uri += ["password={}".format(authconfig_map.get("password"))]
         else:
             if not service_config or not service_config.get("user", None):
-                uri += ["user={}".format(self.configuration.dbusr or fallback_user)]
+                if self.configuration.dbusr:
+                    uri += ["user={}".format(self.configuration.dbusr)]
+                elif fallback_user:
+                    uri += ["user={}".format(fallback_user)]
             if not service_config or not service_config.get("password", None):
                 if self.configuration.dbpwd:
                     uri += ["password={}".format(self.configuration.dbpwd)]