pum 1.1.17__py3-none-any.whl → 1.2.0__py3-none-any.whl

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/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/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/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/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.dist-info → pum-1.2.0.dist-info}/METADATA

@@ -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.2.0.dist-info/RECORD

@@ -0,0 +1,22 @@
+pum/__init__.py,sha256=P-NHd6_SYpk9aypefLI62QCZ3f5APOMCwSzrFFCKAew,759
+pum/changelog.py,sha256=yDc5swmMd5gb2vCEAlenoq5gs-ZEGc4uXicBtiGxkOk,3692
+pum/checker.py,sha256=GT2v7793HP1g94dv0mL6CHtQfblQwAyeFHEWCy44lkc,14379
+pum/cli.py,sha256=p5dMF4PyaM9iKpjd5QQATJLEZRiwhGDjB0oFElibwjE,14275
+pum/config_model.py,sha256=kwUkJ0lFdKyT3V0jJkRyWpI6JNHOqVTYfYKkm3B8v_Q,6884
+pum/dependency_handler.py,sha256=AVeemsh6zUumRJKbRLRwP_FRC0x3K16TJiK2i9ogvn0,3861
+pum/dumper.py,sha256=EJZ8T44JM0GKgdqw1ENOfhZ-RI89OQ4DNdoTZKtLdEw,3404
+pum/exceptions.py,sha256=xyzzY4ht1nKfrVt59Giulflpmu83nJhxoTygrqiqPlw,1137
+pum/hook.py,sha256=5MrVa6Xr0o28RfsXylGDatlM_vOKfKtGJmhYx8crC94,9541
+pum/info.py,sha256=CGj-Lt4Y2l2ymAl3OFqCWfJD5xZF4aaUSztAiSKwgE4,1395
+pum/parameter.py,sha256=qdbWk3WZc419AW-qwGMxlgc-7GEhdwIoPBnDk6UsVZU,2485
+pum/pum_config.py,sha256=mmoTmdb1s8X5xrUUEQ2xqdDZpyESZKOGj3Y8Mja7w3o,11347
+pum/role_manager.py,sha256=sV-pbjczxCTRWPVszrks7V5MIqFSbZtmbPreE7gx13k,10236
+pum/schema_migrations.py,sha256=rUn14aNkt8nw-69cCgklbtveanq6CrNdKKrc458cGIc,10491
+pum/sql_content.py,sha256=-0h3caJlvkyEjZwjPVrKh5ZYaDctC-5lklBvZ-zgRzA,10620
+pum/upgrader.py,sha256=6hqOHwXAyw9H-ksQvQZJDLDD0Gk6QxVsiOtY9bPSY7Y,6387
+pum-1.2.0.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pum-1.2.0.dist-info/METADATA,sha256=40kf_2wb9YRjFCzXxD6-uv6nZcZece0_6HubqiLDs5k,3138
+pum-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pum-1.2.0.dist-info/entry_points.txt,sha256=U6dmxSpKs1Pe9vWiR29VPhJMDjrmZeJCSxvfLGR8BD4,36
+pum-1.2.0.dist-info/top_level.txt,sha256=ddiI4HLBhY6ql-NNm0Ez0JhoOHdWDIzrHeCdHmmagcc,4
+pum-1.2.0.dist-info/RECORD,,

pum-1.1.17.dist-info/RECORD

@@ -1,22 +0,0 @@
-pum/__init__.py,sha256=P-NHd6_SYpk9aypefLI62QCZ3f5APOMCwSzrFFCKAew,759
-pum/changelog.py,sha256=yDc5swmMd5gb2vCEAlenoq5gs-ZEGc4uXicBtiGxkOk,3692
-pum/checker.py,sha256=GT2v7793HP1g94dv0mL6CHtQfblQwAyeFHEWCy44lkc,14379
-pum/cli.py,sha256=p5dMF4PyaM9iKpjd5QQATJLEZRiwhGDjB0oFElibwjE,14275
-pum/config_model.py,sha256=l8PmaP_UJ5gbZH-p8EcE8W4J1wMhS0wPPr01a8wKlsA,6492
-pum/dependency_handler.py,sha256=AVeemsh6zUumRJKbRLRwP_FRC0x3K16TJiK2i9ogvn0,3861
-pum/dumper.py,sha256=EJZ8T44JM0GKgdqw1ENOfhZ-RI89OQ4DNdoTZKtLdEw,3404
-pum/exceptions.py,sha256=xyzzY4ht1nKfrVt59Giulflpmu83nJhxoTygrqiqPlw,1137
-pum/hook.py,sha256=5MrVa6Xr0o28RfsXylGDatlM_vOKfKtGJmhYx8crC94,9541
-pum/info.py,sha256=CGj-Lt4Y2l2ymAl3OFqCWfJD5xZF4aaUSztAiSKwgE4,1395
-pum/parameter.py,sha256=qdbWk3WZc419AW-qwGMxlgc-7GEhdwIoPBnDk6UsVZU,2485
-pum/pum_config.py,sha256=bnL3rxgd7YNLD9u8Yyl7lNPxt7YtRXC0cpDP-l1Rw9w,11245
-pum/role_manager.py,sha256=yr-fmytflGqANY3IZIpgJBoMOK98ynTWfemIBhAy79A,10131
-pum/schema_migrations.py,sha256=MCA40pCptwWeoZQuZb3zyvbLDU7I1YdRbr1Hgpe9hYg,10481
-pum/sql_content.py,sha256=-0h3caJlvkyEjZwjPVrKh5ZYaDctC-5lklBvZ-zgRzA,10620
-pum/upgrader.py,sha256=5o3d-RoZoUifw4POHRe2map2ik1FFe8SagGSa1reQUg,6333
-pum-1.1.17.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pum-1.1.17.dist-info/METADATA,sha256=X8budn6t9STUdtHwdbqxDMiwIehSmBM4dx5dCIqbMcU,3139
-pum-1.1.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pum-1.1.17.dist-info/entry_points.txt,sha256=U6dmxSpKs1Pe9vWiR29VPhJMDjrmZeJCSxvfLGR8BD4,36
-pum-1.1.17.dist-info/top_level.txt,sha256=ddiI4HLBhY6ql-NNm0Ez0JhoOHdWDIzrHeCdHmmagcc,4
-pum-1.1.17.dist-info/RECORD,,