half-orm-dev 0.17.5a4__tar.gz → 0.17.5a5__tar.gz

{half_orm_dev-0.17.5a4/half_orm_dev.egg-info → half_orm_dev-0.17.5a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.5a4
+Version: 0.17.5a5
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

{half_orm_dev-0.17.5a4 → half_orm_dev-0.17.5a5}/half_orm_dev/patch_manager.py

@@ -572,9 +572,10 @@ class PatchManager:
 
                 if release_schema_path and release_schema_path.exists():
                     # New workflow: restore from release schema (includes all staged patches)
-                    # Bootstrap scripts run automatically, excluding current patch
+                    # Exclude bootstraps for this version — apply_patch_files will
+                    # execute the current patch's bootstrap below.
                     self._repo.restore_database_from_release_schema(
-                        version, exclude_bootstrap_patch_id=patch_id
+                        version, exclude_bootstrap_version=version
                     )
 
                     # Apply only the current patch
@@ -583,9 +584,10 @@ class PatchManager:
                 else:
                     # Backward compatibility: old workflow
                     # Also generates release schema for migration of existing projects
-                    # Bootstrap scripts run automatically, excluding current patch
+                    # Exclude bootstraps for this version — apply_patch_files will
+                    # execute them when applying staged patches below.
                     self._repo.restore_database_from_schema(
-                        exclude_bootstrap_patch_id=patch_id
+                        exclude_bootstrap_version=version
                     )
 
                     # Get and apply all staged release patches
@@ -692,11 +694,6 @@ class PatchManager:
 
         # Apply files in lexicographic order
         for patch_file in structure.files:
-            # Skip bootstrap files - they are executed via run_bootstrap() after merge
-            if is_bootstrap_file(patch_file.path):
-                click.echo(f"  • {patch_file.name} (bootstrap - skipped, will run after merge)")
-                continue
-
             if patch_file.is_sql:
                 click.echo(f"  • {patch_file.name}")
                 try:
@@ -1061,6 +1058,11 @@ class PatchManager:
             shutil.copy(file_path, dest)
             copied.append(new_name)
 
+            # Record as already executed — the bootstrap SQL was already
+            # run by apply_patch_files during validation, so run_bootstrap
+            # must skip it to avoid double execution.
+            bootstrap_mgr.record_execution(new_name, version)
+
             click.echo(f"  • Copied bootstrap file: {new_name}")
 
         return copied

{half_orm_dev-0.17.5a4 → half_orm_dev-0.17.5a5}/half_orm_dev/release_manager.py

@@ -2499,16 +2499,14 @@ class ReleaseManager:
             self._repo.hgit.checkout("-b", temp_branch)
 
             # 6. Apply patches to database (validation)
-            # Exclude current version's bootstraps — they run at step 7 after patches
+            # Bootstrap SQL in patches is executed by apply_patch_files.
+            # Bootstraps from bootstrap/ for OTHER versions run during restore.
+            # Bootstraps for THIS version are excluded (already run via patches).
             self._apply_release_patches(
                 version, force_apply=is_prod, exclude_bootstrap_version=version
             )
 
-            # 7. Execute bootstrap scripts for the version being promoted
-            # (excluded from restore at step 6, run now that patches are applied)
-            self._run_bootstrap_scripts(for_version=version)
-
-            # 8. Register version in database
+            # 7. Register version in database
             version_parts = version.split('.')
             major, minor, patch_num = map(int, version_parts)
             if is_prod:

half_orm_dev-0.17.5a5/half_orm_dev/version.txt

@@ -0,0 +1 @@
+0.17.5-a5

{half_orm_dev-0.17.5a4 → half_orm_dev-0.17.5a5/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.5a4
+Version: 0.17.5a5
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

half_orm_dev-0.17.5a4/half_orm_dev/version.txt

@@ -1 +0,0 @@
-0.17.5-a4