pytest-postgresql 5.1.1__tar.gz → 6.0.1__tar.gz

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/CHANGES.rst

@@ -3,6 +3,65 @@ CHANGELOG
 
 .. towncrier release notes start
 
+6.0.1 (2024-08-14)
+==================
+
+Bugfixes
+--------
+
+- Fixed a long-standing bug, where calls to pg_ctl weren't getting `LC_*` and `LANG` envvars,
+  which caused issues on some systems not recognizing --auth parameter. (`#343 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/343>`__)
+
+
+Miscellaneus
+------------
+
+- `#945 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/945>`__
+
+
+6.0.0 (2024-03-11)
+==================
+
+Breaking changes
+----------------
+
+- DatabaseJanitor class now accepts only keyword arguments. (`#899 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/899>`__)
+
+
+Bugfixes
+--------
+
+- Fix the remaining `DepcrecationWarning` for `datetime.datetime.utcnow` on Python 3.12. (`#896 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/896>`__)
+
+
+Deprecations
+------------
+
+- Deprecated load parameter on a client fixture.
+  Developers are encouraged to either use the load function/parameter
+  for process fixture, or create an intermediate fixture placed between client
+  and tests themselves to fill in the data. (`#850 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/850>`__)
+
+
+Features
+--------
+
+- Now all sql files used to initialise database for tests, has to be passed as pathlib.Path instance.
+
+  This helps the DatabaseJanitor choose correct behaviour based on parameter. (`#638 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/638>`__)
+- Have separate parameters for template database name and database name in DatabaseJanitor.
+  It'll make it much clearer to understand the code and Janitor's behaviour. (`#672 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/672>`__)
+- Template databases are now created with is_template flag turned on, and not by setting allow_connections to false.
+
+  The allow_connections flag being set to false is used strictly right before we attempt to drop the database. (`#914 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/914>`__)
+
+
+Miscellaneus
+------------
+
+- `#865 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/865>`__, `#882 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/882>`__, `#893 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/893>`__, `#900 <https://github.com/ClearcodeHQ/pytest-postgresql/issues/900>`__
+
+
 5.1.1 (2024-03-07)
 ==================
 
@@ -385,4 +444,4 @@ Bugfix
 - create command line and pytest.ini configuration options for executable
 - create command line and pytest.ini configuration options for host
 - create command line and pytest.ini configuration options for port
-- Extracted code from pytest-dbfixtures
+- Extracted code from pytest-postgresql

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: pytest-postgresql
-Version: 5.1.1
+Version: 6.0.1
 Summary: Postgresql fixtures and fixture factories for Pytest.
 Author-email: Grzegorz Śliwiński <fizyk+pypi@fizyk.dev>
 Project-URL: Source, https://github.com/ClearcodeHQ/pytest-postgresql
 Project-URL: Bug Tracker, https://github.com/ClearcodeHQ/pytest-postgresql/issues
-Project-URL: Changelog, https://github.com/ClearcodeHQ/pytest-postgresql/blob/v5.1.1/CHANGES.rst
+Project-URL: Changelog, https://github.com/ClearcodeHQ/pytest-postgresql/blob/v6.0.1/CHANGES.rst
 Keywords: tests,pytest,fixture,postgresql
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
@@ -141,9 +141,10 @@ Client specific loads the database each test
 
 .. code-block:: python
 
+    from pathlib import Path
     postgresql_my_with_schema = factories.postgresql(
         'postgresql_my_proc',
-        load=["schemafile.sql", "otherschema.sql", "import.path.to.function", "import.path.to:otherfunction", load_this]
+        load=[Path("schemafile.sql"), Path("otherschema.sql"), "import.path.to.function", "import.path.to:otherfunction", load_this]
     )
 
 .. warning::
@@ -152,12 +153,13 @@ Client specific loads the database each test
 
 
 The process fixture performs the load once per test session, and loads the data into the template database.
-Client fixture then creates test database out of the template database each test, which significantly speeds up the tests.
+Client fixture then creates test database out of the template database each test, which significantly **speeds up the tests**.
 
 .. code-block:: python
 
+    from pathlib import Path
     postgresql_my_proc = factories.postgresql_proc(
-        load=["schemafile.sql", "otherschema.sql", "import.path.to.function", "import.path.to:otherfunction", load_this]
+        load=[Path("schemafile.sql"), Path("otherschema.sql"), "import.path.to.function", "import.path.to:otherfunction", load_this]
     )
 
 
@@ -511,7 +513,7 @@ it'll be on a docker machine or running remotely or locally.
 Using SQLAlchemy to initialise basic database state
 +++++++++++++++++++++++++++++++++++++++++++++++++++
 
-How to use SQLAlchemy for common initalisation:
+How to use SQLAlchemy for common initialisation:
 
 .. code-block:: python
 

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/README.rst

@@ -104,9 +104,10 @@ Client specific loads the database each test
 
 .. code-block:: python
 
+    from pathlib import Path
     postgresql_my_with_schema = factories.postgresql(
         'postgresql_my_proc',
-        load=["schemafile.sql", "otherschema.sql", "import.path.to.function", "import.path.to:otherfunction", load_this]
+        load=[Path("schemafile.sql"), Path("otherschema.sql"), "import.path.to.function", "import.path.to:otherfunction", load_this]
     )
 
 .. warning::
@@ -115,12 +116,13 @@ Client specific loads the database each test
 
 
 The process fixture performs the load once per test session, and loads the data into the template database.
-Client fixture then creates test database out of the template database each test, which significantly speeds up the tests.
+Client fixture then creates test database out of the template database each test, which significantly **speeds up the tests**.
 
 .. code-block:: python
 
+    from pathlib import Path
     postgresql_my_proc = factories.postgresql_proc(
-        load=["schemafile.sql", "otherschema.sql", "import.path.to.function", "import.path.to:otherfunction", load_this]
+        load=[Path("schemafile.sql"), Path("otherschema.sql"), "import.path.to.function", "import.path.to:otherfunction", load_this]
     )
 
 
@@ -474,7 +476,7 @@ it'll be on a docker machine or running remotely or locally.
 Using SQLAlchemy to initialise basic database state
 +++++++++++++++++++++++++++++++++++++++++++++++++++
 
-How to use SQLAlchemy for common initalisation:
+How to use SQLAlchemy for common initialisation:
 
 .. code-block:: python
 

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pytest-postgresql"
-version = "5.1.1"
+version = "6.0.1"
 description = "Postgresql fixtures and fixture factories for Pytest."
 readme = "README.rst"
 keywords = ["tests", "pytest", "fixture", "postgresql"]
@@ -39,7 +39,7 @@ requires-python = ">= 3.8"
 [project.urls]
 "Source" = "https://github.com/ClearcodeHQ/pytest-postgresql"
 "Bug Tracker" = "https://github.com/ClearcodeHQ/pytest-postgresql/issues"
-"Changelog" = "https://github.com/ClearcodeHQ/pytest-postgresql/blob/v5.1.1/CHANGES.rst"
+"Changelog" = "https://github.com/ClearcodeHQ/pytest-postgresql/blob/v6.0.1/CHANGES.rst"
 
 [project.entry-points."pytest11"]
 pytest_postgresql = "pytest_postgresql.plugin"
@@ -95,16 +95,20 @@ showcontent = true
 name = "Bugfixes"
 showcontent = true
 
+[tool.towncrier.fragment.deprecate]
+name = "Deprecations"
+showcontent = true
+
 [tool.towncrier.fragment.break]
 name = "Breaking changes"
 showcontent = true
 
 [tool.towncrier.fragment.misc]
 name = "Miscellaneus"
-showcontent = true
+showcontent = false
 
 [tool.tbump.version]
-current = "5.1.1"
+current = "6.0.1"
 
 # Example of a semver regexp.
 # Make sure this matches current_version before

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql/__init__.py

@@ -18,4 +18,4 @@
 # along with pytest-postgresql. If not, see <http://www.gnu.org/licenses/>.
 """Main module for pytest-postgresql."""
 
-__version__ = "5.1.1"
+__version__ = "6.0.1"

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql/config.py

@@ -1,5 +1,7 @@
 """Plugin's configuration."""
-from typing import Any, List, Optional, TypedDict
+
+from pathlib import Path
+from typing import Any, List, Optional, TypedDict, Union
 
 from pytest import FixtureRequest
 
@@ -16,7 +18,7 @@ class PostgresqlConfigDict(TypedDict):
     startparams: str
     unixsocketdir: str
     dbname: str
-    load: List[str]
+    load: List[Union[Path, str]]
     postgres_options: str
 
 
@@ -27,6 +29,8 @@ def get_config(request: FixtureRequest) -> PostgresqlConfigDict:
         name = "postgresql_" + option
         return request.config.getoption(name) or request.config.getini(name)
 
+    load_paths = detect_paths(get_postgresql_option("load"))
+
     return PostgresqlConfigDict(
         exec=get_postgresql_option("exec"),
         host=get_postgresql_option("host"),
@@ -37,6 +41,17 @@ def get_config(request: FixtureRequest) -> PostgresqlConfigDict:
         startparams=get_postgresql_option("startparams"),
         unixsocketdir=get_postgresql_option("unixsocketdir"),
         dbname=get_postgresql_option("dbname"),
-        load=get_postgresql_option("load"),
+        load=load_paths,
         postgres_options=get_postgresql_option("postgres_options"),
     )
+
+
+def detect_paths(load_paths: List[str]) -> List[Union[Path, str]]:
+    """Convert path to sql files to Path instances."""
+    converted_load_paths: List[Union[Path, str]] = []
+    for path in load_paths:
+        if path.endswith(".sql"):
+            converted_load_paths.append(Path(path))
+        else:
+            converted_load_paths.append(path)
+    return converted_load_paths

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql/executor.py

@@ -3,18 +3,18 @@
 
 # This file is part of pytest-postgresql.
 
-# pytest-dbfixtures is free software: you can redistribute it and/or modify
+# pytest-postgresql is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 
-# pytest-dbfixtures is distributed in the hope that it will be useful,
+# pytest-postgresql is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public License
-# along with pytest-dbfixtures.  If not, see <http://www.gnu.org/licenses/>.
+# along with pytest-postgresql.  If not, see <http://www.gnu.org/licenses/>.
 """PostgreSQL executor crafter around pg_ctl."""
 
 import os.path
@@ -131,6 +131,11 @@ class PostgreSQLExecutor(TCPExecutor):
             },
         )
 
+    @property
+    def template_dbname(self) -> str:
+        """Return the template database name."""
+        return f"{self.dbname}_tmpl"
+
     def start(self: T) -> T:
         """Add check for postgresql version before starting process."""
         if self.version < self.MIN_SUPPORTED_VERSION:
@@ -172,11 +177,13 @@ class PostgreSQLExecutor(TCPExecutor):
                 password_file.write(password)
                 password_file.flush()
                 init_directory += ["-o", " ".join(options)]
-                subprocess.check_output(init_directory)
+                # Passing envvars to command to avoid weird MacOs error.
+                subprocess.check_output(init_directory, env=self._envvars)
         else:
             options += ["--auth=trust"]
             init_directory += ["-o", " ".join(options)]
-            subprocess.check_output(init_directory)
+            # Passing envvars to command to avoid weird MacOs error.
+            subprocess.check_output(init_directory, env=self._envvars)
 
         self._directory_initialised = True
 

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql/executor_noop.py

@@ -3,18 +3,18 @@
 
 # This file is part of pytest-postgresql.
 
-# pytest-dbfixtures is free software: you can redistribute it and/or modify
+# pytest-postgresql is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 
-# pytest-dbfixtures is distributed in the hope that it will be useful,
+# pytest-postgresql is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public License
-# along with pytest-dbfixtures.  If not, see <http://www.gnu.org/licenses/>.
+# along with pytest-postgresql.  If not, see <http://www.gnu.org/licenses/>.
 """PostgreSQL Noop executor providing connection details for postgres client."""
 from typing import Any, Optional, Union
 
@@ -56,6 +56,11 @@ class NoopExecutor:
         self.dbname = dbname
         self._version: Any = None
 
+    @property
+    def template_dbname(self) -> str:
+        """Return the template database name."""
+        return f"{self.dbname}_tmpl"
+
     @property
     def version(self) -> Any:
         """Get postgresql's version."""

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql/factories/__init__.py

@@ -3,18 +3,18 @@
 
 # This file is part of pytest-postgresql.
 
-# pytest-dbfixtures is free software: you can redistribute it and/or modify
+# pytest-postgresql is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 
-# pytest-dbfixtures is distributed in the hope that it will be useful,
+# pytest-postgresql is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public License
-# along with pytest-dbfixtures.  If not, see <http://www.gnu.org/licenses/>.
+# along with pytest-postgresql.  If not, see <http://www.gnu.org/licenses/>.
 """Fixture factories for postgresql fixtures."""
 
 from pytest_postgresql.factories.client import postgresql

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql/factories/client.py

@@ -3,19 +3,21 @@
 
 # This file is part of pytest-postgresql.
 
-# pytest-dbfixtures is free software: you can redistribute it and/or modify
+# pytest-postgresql is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 
-# pytest-dbfixtures is distributed in the hope that it will be useful,
+# pytest-postgresql is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public License
-# along with pytest-dbfixtures.  If not, see <http://www.gnu.org/licenses/>.
+# along with pytest-postgresql.  If not, see <http://www.gnu.org/licenses/>.
 """Fixture factory for postgresql client."""
+import warnings
+from pathlib import Path
 from typing import Callable, Iterator, List, Optional, Union
 
 import psycopg
@@ -31,7 +33,7 @@ from pytest_postgresql.janitor import DatabaseJanitor
 def postgresql(
     process_fixture_name: str,
     dbname: Optional[str] = None,
-    load: Optional[List[Union[Callable, str]]] = None,
+    load: Optional[List[Union[Callable, str, Path]]] = None,
     isolation_level: "Optional[psycopg.IsolationLevel]" = None,
 ) -> Callable[[FixtureRequest], Iterator[Connection]]:
     """Return connection fixture factory for PostgreSQL.
@@ -63,9 +65,25 @@ def postgresql(
         pg_options = proc_fixture.options
         pg_db = dbname or proc_fixture.dbname
         pg_load = load or []
-
+        if pg_load:
+            warnings.warn(
+                message=(
+                    "Load is deprecated on a client fixture. "
+                    "You should either process fixture load parameter to pre-fill database, "
+                    "or add a fixture between client and a test, "
+                    "that will fill the database with the data."
+                ),
+                category=DeprecationWarning,
+            )
         with DatabaseJanitor(
-            pg_user, pg_host, pg_port, pg_db, proc_fixture.version, pg_password, isolation_level
+            user=pg_user,
+            host=pg_host,
+            port=pg_port,
+            dbname=pg_db,
+            template_dbname=proc_fixture.template_dbname,
+            version=proc_fixture.version,
+            password=pg_password,
+            isolation_level=isolation_level,
         ) as janitor:
             db_connection: Connection = psycopg.connect(
                 dbname=pg_db,

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql/factories/noprocess.py

@@ -3,20 +3,21 @@
 
 # This file is part of pytest-postgresql.
 
-# pytest-dbfixtures is free software: you can redistribute it and/or modify
+# pytest-postgresql is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 
-# pytest-dbfixtures is distributed in the hope that it will be useful,
+# pytest-postgresql is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public License
-# along with pytest-dbfixtures.  If not, see <http://www.gnu.org/licenses/>.
+# along with pytest-postgresql.  If not, see <http://www.gnu.org/licenses/>.
 """Fixture factory for existing postgresql server."""
 import os
+from pathlib import Path
 from typing import Callable, Iterator, List, Optional, Union
 
 import pytest
@@ -42,7 +43,7 @@ def postgresql_noproc(
     password: Optional[str] = None,
     dbname: Optional[str] = None,
     options: str = "",
-    load: Optional[List[Union[Callable, str]]] = None,
+    load: Optional[List[Union[Callable, str, Path]]] = None,
 ) -> Callable[[FixtureRequest], Iterator[NoopExecutor]]:
     """Postgresql noprocess factory.
 
@@ -80,12 +81,11 @@ def postgresql_noproc(
             dbname=pg_dbname,
             options=pg_options,
         )
-        template_dbname = f"{noop_exec.dbname}_tmpl"
         with DatabaseJanitor(
             user=noop_exec.user,
             host=noop_exec.host,
             port=noop_exec.port,
-            dbname=template_dbname,
+            template_dbname=noop_exec.template_dbname,
             version=noop_exec.version,
             password=noop_exec.password,
         ) as janitor:

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql/factories/process.py

@@ -3,22 +3,23 @@
 
 # This file is part of pytest-postgresql.
 
-# pytest-dbfixtures is free software: you can redistribute it and/or modify
+# pytest-postgresql is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 
-# pytest-dbfixtures is distributed in the hope that it will be useful,
+# pytest-postgresql is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Lesser General Public License for more details.
 
 # You should have received a copy of the GNU Lesser General Public License
-# along with pytest-dbfixtures.  If not, see <http://www.gnu.org/licenses/>.
+# along with pytest-postgresql.  If not, see <http://www.gnu.org/licenses/>.
 """Fixture factory for postgresql process."""
 import os.path
 import platform
 import subprocess
+from pathlib import Path
 from typing import Callable, Iterator, List, Optional, Set, Tuple, Union
 
 import pytest
@@ -54,7 +55,7 @@ def postgresql_proc(
     startparams: Optional[str] = None,
     unixsocketdir: Optional[str] = None,
     postgres_options: Optional[str] = None,
-    load: Optional[List[Union[Callable, str]]] = None,
+    load: Optional[List[Union[Callable, str, Path]]] = None,
 ) -> Callable[[FixtureRequest, TempPathFactory], Iterator[PostgreSQLExecutor]]:
     """Postgresql process factory.
 
@@ -135,12 +136,11 @@ def postgresql_proc(
         # 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,
-                dbname=template_dbname,
+                template_dbname=postgresql_executor.template_dbname,
                 version=postgresql_executor.version,
                 password=postgresql_executor.password,
             ) as janitor:

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql/janitor.py

@@ -1,7 +1,7 @@
 """Database Janitor."""
-import re
+
 from contextlib import contextmanager
-from functools import partial
+from pathlib import Path
 from types import TracebackType
 from typing import Callable, Iterator, Optional, Type, TypeVar, Union
 
@@ -9,8 +9,8 @@ import psycopg
 from packaging.version import parse
 from psycopg import Connection, Cursor
 
+from pytest_postgresql.loader import build_loader
 from pytest_postgresql.retry import retry
-from pytest_postgresql.sql import loader
 
 Version = type(parse("1"))
 
@@ -23,11 +23,13 @@ class DatabaseJanitor:
 
     def __init__(
         self,
+        *,
         user: str,
         host: str,
         port: Union[str, int],
-        dbname: str,
         version: Union[str, float, Version],  # type: ignore[valid-type]
+        dbname: Optional[str] = None,
+        template_dbname: Optional[str] = None,
         password: Optional[str] = None,
         isolation_level: "Optional[psycopg.IsolationLevel]" = None,
         connection_timeout: int = 60,
@@ -38,6 +40,7 @@ class DatabaseJanitor:
         :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
@@ -49,7 +52,10 @@ class DatabaseJanitor:
         self.password = password
         self.host = host
         self.port = port
+        # At least one of the dbname or template_dbname has to be filled.
+        assert any([dbname, template_dbname])
         self.dbname = dbname
+        self.template_dbname = template_dbname
         self._connection_timeout = connection_timeout
         self.isolation_level = isolation_level
         if not isinstance(version, Version):
@@ -59,36 +65,33 @@ class DatabaseJanitor:
 
     def init(self) -> None:
         """Create database in postgresql."""
-        template_name = f"{self.dbname}_tmpl"
         with self.cursor() as cur:
-            if self.dbname.endswith("_tmpl"):
-                result = False
-            else:
-                cur.execute(
-                    "SELECT EXISTS "
-                    "(SELECT datname FROM pg_catalog.pg_database WHERE datname= %s);",
-                    (template_name,),
-                )
-                row = cur.fetchone()
-                result = (row is not None) and row[0]
-            if not result:
+            if self.is_template():
+                cur.execute(f'CREATE DATABASE "{self.template_dbname}" WITH is_template = true;')
+            elif self.template_dbname is None:
                 cur.execute(f'CREATE DATABASE "{self.dbname}";')
             else:
-                # All template database does not allow connection:
-                self._dont_datallowconn(cur, template_name)
                 # And make sure no-one is left connected to the template database.
-                # Otherwise Creating database from template will fail
-                self._terminate_connection(cur, template_name)
-                cur.execute(f'CREATE DATABASE "{self.dbname}" TEMPLATE "{template_name}";')
+                # Otherwise, Creating database from template will fail
+                self._terminate_connection(cur, self.template_dbname)
+                cur.execute(f'CREATE DATABASE "{self.dbname}" TEMPLATE "{self.template_dbname}";')
+
+    def is_template(self) -> bool:
+        """Determine whether the DatabaseJanitor maintains template or database."""
+        return self.dbname is None
 
     def drop(self) -> None:
         """Drop database in postgresql."""
         # We cannot drop the database while there are connections to it, so we
         # terminate all connections first while not allowing new connections.
+        db_to_drop = self.template_dbname if self.is_template() else self.dbname
+        assert db_to_drop
         with self.cursor() as cur:
-            self._dont_datallowconn(cur, self.dbname)
-            self._terminate_connection(cur, self.dbname)
-            cur.execute(f'DROP DATABASE IF EXISTS "{self.dbname}";')
+            self._dont_datallowconn(cur, db_to_drop)
+            self._terminate_connection(cur, db_to_drop)
+            if self.is_template():
+                cur.execute(f'ALTER DATABASE "{db_to_drop}" with is_template false;')
+            cur.execute(f'DROP DATABASE IF EXISTS "{db_to_drop}";')
 
     @staticmethod
     def _dont_datallowconn(cur: Cursor, dbname: str) -> None:
@@ -103,28 +106,23 @@ class DatabaseJanitor:
             (dbname,),
         )
 
-    def load(self, load: Union[Callable, str]) -> None:
+    def load(self, load: Union[Callable, str, Path]) -> None:
         """Load data into a database.
 
-        Either runs a passed loader if it's callback,
-        or runs predefined loader if it's sql file.
+        Expects:
+
+            * a Path to sql file, that'll be loaded
+            * an import path to import callable
+            * a callable that expects: host, port, user, dbname and password arguments.
+
         """
-        if isinstance(load, str):
-            if "/" in load:
-                _loader: Callable = partial(loader, load)
-            else:
-                loader_parts = re.split("[.:]", load, 2)
-                import_path = ".".join(loader_parts[:-1])
-                loader_name = loader_parts[-1]
-                _temp_import = __import__(import_path, globals(), locals(), fromlist=[loader_name])
-                _loader = getattr(_temp_import, loader_name)
-        else:
-            _loader = load
+        db_to_load = self.template_dbname if self.is_template() else self.dbname
+        _loader = build_loader(load)
         _loader(
             host=self.host,
             port=self.port,
             user=self.user,
-            dbname=self.dbname,
+            dbname=db_to_load,
             password=self.password,
         )
 

pytest_postgresql-6.0.1/pytest_postgresql/loader.py

@@ -0,0 +1,32 @@
+"""Loader helper functions."""
+
+import re
+from functools import partial
+from pathlib import Path
+from typing import Any, Callable, Union
+
+import psycopg
+
+
+def build_loader(load: Union[Callable, str, Path]) -> Callable:
+    """Build a loader callable."""
+    if isinstance(load, Path):
+        return partial(sql, load)
+    elif isinstance(load, str):
+        loader_parts = re.split("[.:]", load, 2)
+        import_path = ".".join(loader_parts[:-1])
+        loader_name = loader_parts[-1]
+        _temp_import = __import__(import_path, globals(), locals(), fromlist=[loader_name])
+        _loader: Callable = getattr(_temp_import, loader_name)
+        return _loader
+    else:
+        return load
+
+
+def sql(sql_filename: Path, **kwargs: Any) -> None:
+    """Database loader for sql files."""
+    db_connection = psycopg.connect(**kwargs)
+    with open(sql_filename, "r") as _fd:
+        with db_connection.cursor() as cur:
+            cur.execute(_fd.read())
+    db_connection.commit()

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql/plugin.py

@@ -3,7 +3,7 @@
 
 # This file is part of pytest-postgresql.
 
-# pytest-dbfixtures is free software: you can redistribute it and/or modify
+# pytest-postgresql is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.

pytest_postgresql-6.0.1/pytest_postgresql/retry.py

@@ -0,0 +1,48 @@
+"""Small retry callable in case of specific error occurred."""
+
+import datetime
+import sys
+from time import sleep
+from typing import Callable, Type, TypeVar
+
+T = TypeVar("T")
+
+
+def retry(
+    func: Callable[[], T],
+    timeout: int = 60,
+    possible_exception: Type[Exception] = Exception,
+) -> T:
+    """Attempt to retry the function for timeout time.
+
+    Most often used for connecting to postgresql database as,
+    especially on macos on github-actions, first few tries fails
+    with this message:
+
+    ... ::
+        FATAL:  the database system is starting up
+    """
+    time: datetime.datetime = get_current_datetime()
+    timeout_diff: datetime.timedelta = datetime.timedelta(seconds=timeout)
+    i = 0
+    while True:
+        i += 1
+        try:
+            res = func()
+            return res
+        except possible_exception as e:
+            if time + timeout_diff < get_current_datetime():
+                raise TimeoutError(f"Failed after {i} attempts") from e
+            sleep(1)
+
+
+def get_current_datetime() -> datetime.datetime:
+    """Get the current datetime."""
+    # To ensure the current datetime retrieval is adjusted with the latest
+    # versions of Python while ensuring retro-compatibility with
+    # Python 3.8, 3.9 and 3.10, we check what version of Python is
+    # being used before deciding how to operate
+    if sys.version_info.major == 3 and sys.version_info.minor > 10:
+        return datetime.datetime.now(datetime.UTC)
+
+    return datetime.datetime.utcnow()

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: pytest-postgresql
-Version: 5.1.1
+Version: 6.0.1
 Summary: Postgresql fixtures and fixture factories for Pytest.
 Author-email: Grzegorz Śliwiński <fizyk+pypi@fizyk.dev>
 Project-URL: Source, https://github.com/ClearcodeHQ/pytest-postgresql
 Project-URL: Bug Tracker, https://github.com/ClearcodeHQ/pytest-postgresql/issues
-Project-URL: Changelog, https://github.com/ClearcodeHQ/pytest-postgresql/blob/v5.1.1/CHANGES.rst
+Project-URL: Changelog, https://github.com/ClearcodeHQ/pytest-postgresql/blob/v6.0.1/CHANGES.rst
 Keywords: tests,pytest,fixture,postgresql
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
@@ -141,9 +141,10 @@ Client specific loads the database each test
 
 .. code-block:: python
 
+    from pathlib import Path
     postgresql_my_with_schema = factories.postgresql(
         'postgresql_my_proc',
-        load=["schemafile.sql", "otherschema.sql", "import.path.to.function", "import.path.to:otherfunction", load_this]
+        load=[Path("schemafile.sql"), Path("otherschema.sql"), "import.path.to.function", "import.path.to:otherfunction", load_this]
     )
 
 .. warning::
@@ -152,12 +153,13 @@ Client specific loads the database each test
 
 
 The process fixture performs the load once per test session, and loads the data into the template database.
-Client fixture then creates test database out of the template database each test, which significantly speeds up the tests.
+Client fixture then creates test database out of the template database each test, which significantly **speeds up the tests**.
 
 .. code-block:: python
 
+    from pathlib import Path
     postgresql_my_proc = factories.postgresql_proc(
-        load=["schemafile.sql", "otherschema.sql", "import.path.to.function", "import.path.to:otherfunction", load_this]
+        load=[Path("schemafile.sql"), Path("otherschema.sql"), "import.path.to.function", "import.path.to:otherfunction", load_this]
     )
 
 
@@ -511,7 +513,7 @@ it'll be on a docker machine or running remotely or locally.
 Using SQLAlchemy to initialise basic database state
 +++++++++++++++++++++++++++++++++++++++++++++++++++
 
-How to use SQLAlchemy for common initalisation:
+How to use SQLAlchemy for common initialisation:
 
 .. code-block:: python
 

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/pytest_postgresql.egg-info/SOURCES.txt

@@ -12,10 +12,10 @@ pytest_postgresql/exceptions.py
 pytest_postgresql/executor.py
 pytest_postgresql/executor_noop.py
 pytest_postgresql/janitor.py
+pytest_postgresql/loader.py
 pytest_postgresql/plugin.py
 pytest_postgresql/py.typed
 pytest_postgresql/retry.py
-pytest_postgresql/sql.py
 pytest_postgresql.egg-info/PKG-INFO
 pytest_postgresql.egg-info/SOURCES.txt
 pytest_postgresql.egg-info/dependency_links.txt
@@ -29,6 +29,7 @@ pytest_postgresql/factories/noprocess.py
 pytest_postgresql/factories/process.py
 tests/test_executor.py
 tests/test_janitor.py
+tests/test_loader.py
 tests/test_noopexecutor.py
 tests/test_postgres_options_plugin.py
 tests/test_postgresql.py

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/tests/test_executor.py

@@ -1,4 +1,5 @@
 """Test various executor behaviours."""
+
 import sys
 from typing import Any
 

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/tests/test_janitor.py

@@ -1,4 +1,5 @@
 """Database Janitor tests."""
+
 import sys
 from typing import Any
 from unittest.mock import MagicMock, patch
@@ -14,14 +15,18 @@ VERSION = parse("10")
 @pytest.mark.parametrize("version", (VERSION, 10, "10"))
 def test_version_cast(version: Any) -> None:
     """Test that version is cast to Version object."""
-    janitor = DatabaseJanitor("user", "host", "1234", "database_name", version)
+    janitor = DatabaseJanitor(
+        user="user", host="host", port="1234", dbname="database_name", version=version
+    )
     assert janitor.version == VERSION
 
 
 @patch("pytest_postgresql.janitor.psycopg.connect")
 def test_cursor_selects_postgres_database(connect_mock: MagicMock) -> None:
     """Test that the cursor requests the postgres database."""
-    janitor = DatabaseJanitor("user", "host", "1234", "database_name", 10)
+    janitor = DatabaseJanitor(
+        user="user", host="host", port="1234", dbname="database_name", version=10
+    )
     with janitor.cursor():
         connect_mock.assert_called_once_with(
             dbname="postgres", user="user", password=None, host="host", port="1234"
@@ -31,7 +36,14 @@ def test_cursor_selects_postgres_database(connect_mock: MagicMock) -> None:
 @patch("pytest_postgresql.janitor.psycopg.connect")
 def test_cursor_connects_with_password(connect_mock: MagicMock) -> None:
     """Test that the cursor requests the postgres database."""
-    janitor = DatabaseJanitor("user", "host", "1234", "database_name", 10, "some_password")
+    janitor = DatabaseJanitor(
+        user="user",
+        host="host",
+        port="1234",
+        dbname="database_name",
+        version=10,
+        password="some_password",
+    )
     with janitor.cursor():
         connect_mock.assert_called_once_with(
             dbname="postgres", user="user", password="some_password", host="host", port="1234"

pytest_postgresql-6.0.1/tests/test_loader.py

@@ -0,0 +1,20 @@
+"""Tests for the `build_loader` function."""
+
+from pathlib import Path
+
+from pytest_postgresql.loader import build_loader, sql
+from tests.loader import load_database
+
+
+def test_loader_callables() -> None:
+    """Test handling callables in build_loader."""
+    assert load_database == build_loader(load_database)
+    assert load_database == build_loader("tests.loader:load_database")
+
+
+def test_loader_sql() -> None:
+    """Test returning partial running sql for the sql file path."""
+    sql_path = Path("test_sql/eidastats.sql")
+    loader_func = build_loader(sql_path)
+    assert loader_func.args == (sql_path,)  # type: ignore
+    assert loader_func.func == sql  # type: ignore

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/tests/test_noopexecutor.py

@@ -1,4 +1,5 @@
 """Test for NoopExecutor."""
+
 import psycopg
 
 from pytest_postgresql.executor import PostgreSQLExecutor

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/tests/test_postgres_options_plugin.py

@@ -1,4 +1,5 @@
 """Test behavior of postgres_options passed in different ways."""
+
 from pathlib import Path
 
 import pytest
@@ -32,3 +33,11 @@ def test_postgres_options_config_in_ini(pointed_pytester: Pytester) -> None:
     pointed_pytester.makefile(".ini", pytest="[pytest]\npostgresql_postgres_options = -N 16\n")
     ret = pointed_pytester.runpytest("test_postgres_options.py")
     ret.assert_outcomes(passed=1)
+
+
+def test_postgres_loader_in_cli(pointed_pytester: Pytester) -> None:
+    """Check that command line arguments are honored."""
+    pointed_pytester.copy_example("test_load.py")
+    test_sql_path = pointed_pytester.copy_example("test.sql")
+    ret = pointed_pytester.runpytest(f"--postgresql-load={test_sql_path}", "test_load.py")
+    ret.assert_outcomes(passed=1)

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/tests/test_postgresql.py

@@ -1,4 +1,5 @@
 """All tests for pytest-postgresql."""
+
 import decimal
 
 import pytest

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/tests/test_template_database.py

@@ -1,4 +1,5 @@
 """Template database tests."""
+
 import pytest
 from psycopg import Connection
 

{pytest-postgresql-5.1.1 → pytest_postgresql-6.0.1}/tests/test_version.py

@@ -1,4 +1,5 @@
 """Auxiliary tests."""
+
 import pytest
 
 from pytest_postgresql.executor import PostgreSQLExecutor

pytest-postgresql-5.1.1/pytest_postgresql/retry.py

@@ -1,33 +0,0 @@
-"""Small retry callable in case of specific error occurred."""
-
-from datetime import datetime, timedelta
-from time import sleep
-from typing import Callable, Type, TypeVar
-
-T = TypeVar("T")
-
-
-def retry(
-    func: Callable[[], T], timeout: int = 60, possible_exception: Type[Exception] = Exception
-) -> T:
-    """Attempt to retry the function for timeout time.
-
-    Most often used for connecting to postgresql database as,
-    especially on macos on github-actions, first few tries fails
-    with this message:
-
-    ... ::
-        FATAL:  the database system is starting up
-    """
-    time: datetime = datetime.utcnow()
-    timeout_diff: timedelta = timedelta(seconds=timeout)
-    i = 0
-    while True:
-        i += 1
-        try:
-            res = func()
-            return res
-        except possible_exception as e:
-            if time + timeout_diff < datetime.utcnow():
-                raise TimeoutError(f"Failed after {i} attempts") from e
-            sleep(1)

pytest-postgresql-5.1.1/pytest_postgresql/sql.py

@@ -1,13 +0,0 @@
-"""SQL Loader function."""
-from typing import Any
-
-import psycopg
-
-
-def loader(sql_filename: str, **kwargs: Any) -> None:
-    """Database loader for sql files."""
-    db_connection = psycopg.connect(**kwargs)
-    with open(sql_filename, "r") as _fd:
-        with db_connection.cursor() as cur:
-            cur.execute(_fd.read())
-    db_connection.commit()