fixup: few improvements

Author: fizyk

pytest_postgresql/factories/noprocess.py

@@ -69,7 +69,6 @@ def postgresql_noproc_fixture(request: FixtureRequest) -> Iterator[NoopExecutor]
         """
         config = get_config(request)
 
-        base_template_dbname = None
         if depends_on:
             base = request.getfixturevalue(depends_on)
             pg_host = host or base.host
@@ -84,13 +83,15 @@ def postgresql_noproc_fixture(request: FixtureRequest) -> Iterator[NoopExecutor]
             pg_user = user or config.user
             pg_password = password or config.password
             pg_options = options or config.options
+            base_template_dbname = None
 
         pg_dbname = xdistify_dbname(dbname or config.dbname)
-        pg_options = options or config.options
         pg_load = load or config.load
         drop_test_database = config.drop_test_database
 
-        if depends_on:
+        # In this case there's a risk that both seeded and depends_on fixture
+        # might end up with the same configured dbname.
+        if depends_on and not dbname:
             noop_exec_dbname = f"{pg_dbname}_{depends_on}"
         else:
             noop_exec_dbname = pg_dbname
@@ -112,7 +113,7 @@ def postgresql_noproc_fixture(request: FixtureRequest) -> Iterator[NoopExecutor]
             version=noop_exec.version,
             password=noop_exec.password,
         )
-        if drop_test_database is True:
+        if drop_test_database:
             janitor.drop()
         with janitor:
             for load_element in pg_load: