pum 1.1.17__tar.gz → 1.2.0__tar.gz

{pum-1.1.17 → pum-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pum
-Version: 1.1.17
+Version: 1.2.0
 Summary: Pum stands for "Postgres Upgrades Manager". It is a Database migration management tool very similar to flyway-db or Liquibase, based on metadata tables.
 Author-email: Denis Rouzaud <denis@opengis.ch>
 License-Expression: GPL-2.0-or-later

{pum-1.1.17 → pum-1.2.0}/pum/config_model.py

@@ -132,11 +132,22 @@ class DemoDataModel(PumCustomBaseModel):
     DemoDataModel represents a configuration for demo data.
 
     Attributes:
-        files: Optional list of named demo data files.
+        name: Name of the demo data.
+        file: Optional path to a single demo data file.
+        files: Optional list of paths to multiple demo data files.
     """
 
     name: str = Field(..., description="Name of the demo data.")
-    file: str = Field(..., description="Path to the demo data file.")
+
+    file: Optional[str] = None
+    files: Optional[List[str]] = None
+
+    @model_validator(mode="after")
+    def validate_args(self):
+        file, files = self.file, self.files
+        if (file and files) or (not file and not files):
+            raise PumConfigError("Exactly one of 'file' or 'files' must be set in a demo data set.")
+        return self
 
 
 class DependencyModel(PumCustomBaseModel):

{pum-1.1.17 → pum-1.2.0}/pum/pum_config.py

@@ -256,9 +256,12 @@ class PumConfig:
             else []
         )
 
-    def demo_data(self) -> dict[str, str]:
+    def demo_data(self) -> dict[str, list[str]]:
         """Return a dictionary of demo data files defined in the configuration."""
-        return {dm.name: dm.file for dm in self.config.demo_data}
+        demo_data_files = {}
+        for dm in self.config.demo_data:
+            demo_data_files[dm.name] = dm.files or [dm.file]
+        return demo_data_files
 
     def __del__(self):
         # Cleanup temporary directories and sys.path modifications

{pum-1.1.17 → pum-1.2.0}/pum/role_manager.py

@@ -125,7 +125,7 @@ class Role:
         self.inherit = inherit
         self.description = description
 
-    def permissions(self):
+    def permissions(self) -> list[Permission]:
         """
         Returns the list of permissions associated with the role.
         """
@@ -138,11 +138,16 @@ class Role:
         Returns:
             bool: True if the role exists, False otherwise.
         """
-        SqlContent("SELECT 1 FROM pg_roles WHERE rolname = {name}").execute(
-            connection=connection,
-            commit=False,
-            parameters={"name": psycopg.sql.Literal(self.name)},
-        ).fetchone() is not None
+        return (
+            SqlContent("SELECT 1 FROM pg_roles WHERE rolname = {name}")
+            .execute(
+                connection=connection,
+                commit=False,
+                parameters={"name": psycopg.sql.Literal(self.name)},
+            )
+            .fetchone()
+            is not None
+        )
 
     def create(
         self, connection: psycopg.Connection, grant: bool = False, commit: bool = False

{pum-1.1.17 → pum-1.2.0}/pum/schema_migrations.py

@@ -177,9 +177,9 @@ class SchemaMigrations:
         """
         if isinstance(version, packaging.version.Version):
             version = str(version)
-        pattern = re.compile(r"^\d+\.\d+\.\d+$")
+        pattern = re.compile(r"^\d+\.\d+(\.\d+)?$")
         if not re.match(pattern, version):
-            raise ValueError(f"Wrong version format: {version}. Must be x.x.x")
+            raise ValueError(f"Wrong version format: {version}. Must be x.y or x.y.z")
 
         current = self.baseline(connection=connection)
         if current and current >= version:

{pum-1.1.17 → pum-1.2.0}/pum/upgrader.py

@@ -144,8 +144,7 @@ class Upgrader:
         if name not in self.config.demo_data():
             raise PumException(f"Demo data '{name}' not found in the configuration.")
 
-        demo_data_file = self.config.base_path / self.config.demo_data()[name]
-        logger.info("Installing demo data from %s", demo_data_file)
+        logger.info(f"Installing demo data {name}")
 
         for pre_hook in self.config.pre_hook_handlers():
             pre_hook.execute(connection=connection, commit=False, parameters=parameters)
@@ -153,11 +152,13 @@ class Upgrader:
         connection.commit()
 
         parameters_literals = SqlContent.prepare_parameters(parameters)
-        SqlContent(sql=demo_data_file).execute(
-            connection=connection,
-            commit=False,
-            parameters=parameters_literals,
-        )
+        for demo_data_file in self.config.demo_data()[name]:
+            demo_data_file = self.config.base_path / demo_data_file
+            SqlContent(sql=demo_data_file).execute(
+                connection=connection,
+                commit=False,
+                parameters=parameters_literals,
+            )
 
         connection.commit()
 

{pum-1.1.17 → pum-1.2.0}/pum.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pum
-Version: 1.1.17
+Version: 1.2.0
 Summary: Pum stands for "Postgres Upgrades Manager". It is a Database migration management tool very similar to flyway-db or Liquibase, based on metadata tables.
 Author-email: Denis Rouzaud <denis@opengis.ch>
 License-Expression: GPL-2.0-or-later

{pum-1.1.17 → pum-1.2.0}/pyproject.toml

@@ -38,7 +38,7 @@ packages = ["pum"]
 
 [tool.setuptools-git-versioning]
 enabled = true
-starting_version = "0.0.0"
+starting_version = "0.1.2"
 
 [tool.setuptools.dynamic]
 readme = {file = ["README.md"], content-type = "text/markdown"}

{pum-1.1.17 → pum-1.2.0}/test/test_config.py

@@ -6,6 +6,8 @@ from packaging.version import parse as parse_version
 from pum.pum_config import PumConfig
 from pum.exceptions import PumConfigError
 from pum.hook import HookHandler
+import os
+import platform
 
 
 class TestConfig(unittest.TestCase):
@@ -98,6 +100,9 @@ class TestConfig(unittest.TestCase):
             PumConfig(base_path=Path("test") / "data" / "parameters", validate=True)
 
     def test_minimum_version(self) -> None:
+        if os.environ.get("CI") and platform.system().lower().startswith("win"):
+            self.skipTest("Skipped on Windows in CI")
+
         with self.assertRaises(PumConfigError):
             PumConfig(
                 base_path=Path("test") / "data" / "single_changelog",

{pum-1.1.17 → pum-1.2.0}/test/test_roles.py

@@ -98,6 +98,20 @@ class TestRoles(unittest.TestCase):
             )
             self.assertTrue(cur.fetchone()[0])
 
+    def test_multiple_installs_roles(self) -> None:
+        """Test granting permissions to roles."""
+        test_dir = Path("test") / "data" / "roles"
+        cfg = PumConfig.from_yaml(test_dir / ".pum.yaml")
+        with psycopg.connect(f"service={self.pg_service}") as conn:
+            Upgrader(cfg).install(connection=conn, roles=True, grant=True, commit=True)
+            cur = conn.cursor()
+            cur.execute(
+                "DROP TABLE public.pum_migrations CASCADE; "
+                "DROP SCHEMA pum_test_data_schema_1 CASCADE; "
+                "DROP SCHEMA pum_test_data_schema_2 CASCADE;"
+            )
+            Upgrader(cfg).install(connection=conn, roles=True, grant=True, commit=True)
+
 
 if __name__ == "__main__":
     unittest.main()

{pum-1.1.17 → pum-1.2.0}/test/test_upgrader.py

@@ -407,6 +407,24 @@ class TestUpgrader(unittest.TestCase):
             count = cursor.fetchone()[0]
             self.assertEqual(count, 4)
 
+    def test_demo_data_multi(self) -> None:
+        """Test the installation of demo data."""
+        test_dir = Path("test") / "data" / "demo_data_multi"
+        cfg = PumConfig.from_yaml(test_dir / ".pum.yaml")
+        sm = SchemaMigrations(cfg)
+        with psycopg.connect(f"service={self.pg_service}") as conn:
+            self.assertFalse(sm.exists(conn))
+            upgrader = Upgrader(config=cfg)
+            upgrader.install(connection=conn)
+            with self.assertRaises(PumException):
+                upgrader.install_demo_data(connection=conn, name="nope, nothing here fella")
+            upgrader.install_demo_data(connection=conn, name="some cool demo dataset")
+            self.assertTrue(sm.exists(conn))
+            cursor = conn.cursor()
+            cursor.execute("SELECT COUNT(*) FROM pum_test_data.some_table;")
+            count = cursor.fetchone()[0]
+            self.assertEqual(count, 4)
+
     def test_dependencies(self) -> None:
         """Test the installation of dependencies."""
         test_dir = Path("test") / "data" / "dependencies"