fixup: pass template with executor

Author: fizyk

pytest_postgresql/executor.py

@@ -69,6 +69,7 @@ def __init__(
         logfile: str,
         startparams: str,
         dbname: str,
+        template_dbname: str,
         shell: bool = False,
         timeout: Optional[int] = 60,
         sleep: float = 0.1,
@@ -102,6 +103,7 @@ def __init__(
         self.user = user
         self.password = password
         self.dbname = dbname
+        self.template_dbname = template_dbname
         self.options = options
         self.datadir = datadir
         self.unixsocketdir = unixsocketdir

pytest_postgresql/executor_noop.py

@@ -37,6 +37,7 @@ def __init__(
         user: str,
         options: str,
         dbname: str,
+        template_dbname: str,
         password: Optional[str] = None,
     ):
         """Initialize nooperator executor mock.
@@ -54,6 +55,7 @@ def __init__(
         self.options = options
         self.password = password
         self.dbname = dbname
+        self.template_dbname = template_dbname
         self._version: Any = None
 
     @property

pytest_postgresql/factories/client.py

@@ -63,11 +63,7 @@ def postgresql_factory(request: FixtureRequest) -> Iterator[Connection]:
         pg_user = proc_fixture.user
         pg_password = proc_fixture.password
         pg_options = proc_fixture.options
-        pg_db = dbname
-        pg_template = None
-        if not dbname:
-            pg_db = proc_fixture.dbname
-            pg_template = f"{pg_db}_tmpl"
+        pg_db = dbname or proc_fixture.dbname
         pg_load = load or []
         if pg_load:
             warnings.warn(
@@ -84,7 +80,7 @@ def postgresql_factory(request: FixtureRequest) -> Iterator[Connection]:
             host=pg_host,
             port=pg_port,
             dbname=pg_db,
-            template_dbname=pg_template,
+            template_dbname=proc_fixture.template_dbname,
             version=proc_fixture.version,
             password=pg_password,
             isolation_level=isolation_level,

pytest_postgresql/factories/noprocess.py

@@ -79,14 +79,14 @@ def postgresql_noproc_fixture(request: FixtureRequest) -> Iterator[NoopExecutor]
             user=pg_user,
             password=pg_password,
             dbname=pg_dbname,
+            template_dbname=f"{pg_dbname}_tmpl",
             options=pg_options,
         )
-        template_dbname = f"{noop_exec.dbname}_tmpl"
         with DatabaseJanitor(
             user=noop_exec.user,
             host=noop_exec.host,
             port=noop_exec.port,
-            template_dbname=template_dbname,
+            template_dbname=noop_exec.template_dbname,
             version=noop_exec.version,
             password=noop_exec.password,
         ) as janitor:

pytest_postgresql/factories/process.py

@@ -126,6 +126,7 @@ def postgresql_proc_fixture(
             user=user or config["user"],
             password=password or config["password"],
             dbname=pg_dbname,
+            template_dbname=f"{pg_dbname}_tmpl",
             options=options or config["options"],
             datadir=str(datadir),
             unixsocketdir=unixsocketdir or config["unixsocketdir"],
@@ -136,12 +137,11 @@ def postgresql_proc_fixture(
         # start server
         with postgresql_executor:
             postgresql_executor.wait_for_postgres()
-            template_dbname = f"{postgresql_executor.dbname}_tmpl"
             with DatabaseJanitor(
                 user=postgresql_executor.user,
                 host=postgresql_executor.host,
                 port=postgresql_executor.port,
-                template_dbname=template_dbname,
+                template_dbname=postgresql_executor.template_dbname,
                 version=postgresql_executor.version,
                 password=postgresql_executor.password,
             ) as janitor:

pytest_postgresql/janitor.py

@@ -39,6 +39,7 @@ def __init__(
         :param host: postgresql host
         :param port: postgresql port
         :param dbname: database name
+        :param dbname: template database name
         :param version: postgresql version number
         :param password: optional postgresql password
         :param isolation_level: optional postgresql isolation level