pum 1.1.10__py3-none-any.whl → 1.1.15__py3-none-any.whl

pum/cli.py

@@ -351,7 +351,6 @@ def cli() -> int:  # noqa: PLR0912
                 max_version=args.max_version,
                 roles=args.roles,
                 grant=args.grant,
-                demo_data=args.demo_data,
                 beta_testing=args.beta_testing,
             )
             conn.commit()

pum/config_model.py

@@ -36,10 +36,11 @@ class ParameterDefinitionModel(PumCustomBaseModel):
 class HookModel(PumCustomBaseModel):
     """
     HookModel represents a migration hook configuration.
+    It can either execute a file (SQL or Python script) or run inline SQL code.
 
     Attributes:
-        file: Optional path to a SQL file to execute as a hook.
-        code: Optional Python code to execute as a hook.
+        file: Optional path to a SQL file or a Python script to execute as a hook.
+        code: Optional SQL code to execute as a hook.
     """
 
     file: Optional[str] = None

pum/pum_config.py

@@ -262,7 +262,7 @@ class PumConfig:
 
     def __del__(self):
         # Cleanup temporary directories and sys.path modifications
-        if self.dependency_path:
+        if self.dependency_path and sys.path:
             # Remove from sys.path if present
             sys.path = [p for p in sys.path if p != str(self.dependency_path)]
             # Remove the directory if it exists and is a TemporaryDirectory

pum/sql_content.py

@@ -161,6 +161,10 @@ class SqlContent:
             sql: The SQL statement to execute or a path to a SQL file.
 
         """
+        if not isinstance(sql, (str, psycopg.sql.SQL, Path)):
+            raise PumSqlError(
+                f"SQL must be a string, psycopg.sql.SQL object or a Path object, not {type(sql)}."
+            )
         self.sql = sql
 
     def validate(self, parameters: dict | None) -> bool:

pum/upgrader.py

@@ -51,7 +51,6 @@ class Upgrader:
         max_version: str | packaging.version.Version | None = None,
         roles: bool = False,
         grant: bool = False,
-        demo_data: str | None = None,
         beta_testing: bool = False,
         commit: bool = False,
     ) -> None:
@@ -71,8 +70,6 @@ class Upgrader:
                 If True, roles will be created.
             grant:
                 If True, permissions will be granted to the roles.
-            demo_data:
-                The name of the demo data to load. If None, no demo data is loaded.
             beta_testing:
                 If True, the module is installed in beta testing mode.
                 This means that the module will not be able to receive any future updates.
@@ -80,11 +77,6 @@ class Upgrader:
             commit:
                 If True, the changes will be committed to the database.
         """
-        if demo_data and demo_data not in self.config.demo_data():
-            raise PumException(
-                f"Demo data '{demo_data}' not found in the configuration. Available demo data: {self.config.demo_data()}"
-            )
-
         if self.schema_migrations.exists(connection):
             msg = (
                 f"Schema migrations table {self.config.config.pum.migration_table_schema}.pum_migrations already exists. "
@@ -119,15 +111,6 @@ class Upgrader:
                 parameters=parameters,
             )
 
-        if demo_data:
-            demo_data_file = self.config.base_path / self.config.demo_data()[demo_data]
-            logger.info("Installing demo data from %s", demo_data_file)
-            SqlContent(sql=demo_data_file).execute(
-                connection=connection,
-                commit=False,
-                parameters=parameters_literals,
-            )
-
         for post_hook in self.config.post_hook_handlers():
             post_hook.execute(connection=connection, commit=False, parameters=parameters)
 
@@ -152,6 +135,7 @@ class Upgrader:
         parameters: dict | None = None,
     ) -> None:
         """Install demo data for the module.
+
         Args:
             connection: The database connection to use.
             name: The name of the demo data to install.
@@ -180,4 +164,6 @@ class Upgrader:
         for post_hook in self.config.post_hook_handlers():
             post_hook.execute(connection=connection, commit=False, parameters=parameters)
 
+        connection.commit()
+
         logger.info("Demo data '%s' installed successfully.", name)

{pum-1.1.10.dist-info → pum-1.1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pum
-Version: 1.1.10
+Version: 1.1.15
 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.10.dist-info → pum-1.1.15.dist-info}/RECORD

@@ -1,23 +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=mQtspJUYp6TwKfU6x0L5ke9q_pMxrf9Du8xd2bOtREA,14317
-pum/config_model.py,sha256=piSQBYp29gnzqmtN50_OUw5o9d7Q5dEzj4q6G7cIFik,6396
+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=xTEdYh-628pnkoqH56NoPIuhIQauc1d6hksM8hcCCU4,11232
+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=KoAa3CNVH_Hh6Z3FxpCYJCsG1NEiCRpfzlfP8wPFZHE,10414
-pum/upgrader.py,sha256=eWjvdj8OpYLOf-ExLEkOoEqf1UjGWzNRXw0ztkoysGU,7050
-pum/conf/pum_config_example.yaml,sha256=_nwV_7z6S_Se-mejh_My0JFLY-A0Q4nigeLGPZAfcqg,424
-pum-1.1.10.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pum-1.1.10.dist-info/METADATA,sha256=YYJBkXCWiiV3zhPlSHb0pTeBlnbJ8mY6f66TYULtUIk,3139
-pum-1.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pum-1.1.10.dist-info/entry_points.txt,sha256=U6dmxSpKs1Pe9vWiR29VPhJMDjrmZeJCSxvfLGR8BD4,36
-pum-1.1.10.dist-info/top_level.txt,sha256=ddiI4HLBhY6ql-NNm0Ez0JhoOHdWDIzrHeCdHmmagcc,4
-pum-1.1.10.dist-info/RECORD,,
+pum/sql_content.py,sha256=-0h3caJlvkyEjZwjPVrKh5ZYaDctC-5lklBvZ-zgRzA,10620
+pum/upgrader.py,sha256=5o3d-RoZoUifw4POHRe2map2ik1FFe8SagGSa1reQUg,6333
+pum-1.1.15.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pum-1.1.15.dist-info/METADATA,sha256=gES-97iyHql3JwuT7IjVxyTbTgDsL16rwICvpQUq-04,3139
+pum-1.1.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pum-1.1.15.dist-info/entry_points.txt,sha256=U6dmxSpKs1Pe9vWiR29VPhJMDjrmZeJCSxvfLGR8BD4,36
+pum-1.1.15.dist-info/top_level.txt,sha256=ddiI4HLBhY6ql-NNm0Ez0JhoOHdWDIzrHeCdHmmagcc,4
+pum-1.1.15.dist-info/RECORD,,

pum/conf/pum_config_example.yaml

@@ -1,19 +0,0 @@
-#TODO comments
-upgrades_table: qwat_sys.upgrades
-delta_dir: ../update/delta/
-backup_file: /tmp/backup.dump
-ignore_elements:
-  - columns
-  - constraints
-  - views
-  - sequences
-  - indexes
-  - triggers
-  - functions
-  - rules
-
-# pg_dump_exe = 'C:\\Program Files\\PostgreSQL\\9.3\\bin\\pg_dump.exe'
-pg_dump_exe: pg_dump
-
-#  pg_restore_exe = 'C:\\Program Files\\PostgreSQL\\9.3\\bin\\pg_restore.exe'
-pg_restore_exe: pg_restore