half-orm-dev 0.17.3a4__tar.gz → 0.17.3a6__tar.gz

{half_orm_dev-0.17.3a4/half_orm_dev.egg-info → half_orm_dev-0.17.3a6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.3a4
+Version: 0.17.3a6
 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.3a4 → half_orm_dev-0.17.3a6}/half_orm_dev/cli/commands/release.py

@@ -369,39 +369,118 @@ def release_hotfix(version: Optional[str] = None) -> None:
 
 
 @release.command('apply')
-@click.argument('version', type=str, required=False)
-def release_apply(version: Optional[str] = None) -> None:
+@click.option(
+    '--skip-tests',
+    is_flag=True,
+    help='Skip running pytest after applying patches'
+)
+def release_apply(skip_tests: bool) -> None:
     """
-    Test complete release before deployment (NOT IMPLEMENTED YET).
+    Apply all patches for integration testing.
+
+    Restores the database from production schema and applies ALL patches
+    (candidates + staged) to test the complete release integration.
+    Optionally runs pytest to validate the release.
 
-    Applies all patches from a release file to test the complete
-    release workflow before production deployment.
+    Unlike 'patch apply' which only applies validated (staged) patches,
+    this command applies ALL patches including candidates that haven't
+    passed individual validation yet. This enables testing the complete
+    release before promotion.
 
     \b
-    Args:
-        version: Release version to test (e.g., "1.3.5-rc1")
-                 If not provided, applies latest RC
+    Workflow:
+        1. Validate on release branch (ho-release/X.Y.Z)
+        2. Restore database from model/schema.sql
+        3. Apply all RC patches (if any)
+        4. Apply ALL TOML patches (candidates + staged)
+        5. Generate Python code
+        6. Run pytest (unless --skip-tests)
+
+    \b
+    Requirements:
+        - Must be on ho-release/X.Y.Z branch
+        - Development release must exist
 
     \b
     Examples:
-        Test latest RC:
+        Apply all patches and run tests:
         $ half_orm dev release apply
 
-        Test specific RC:
-        $ half_orm dev release apply 1.3.5-rc1
-
-        Test stage release:
-        $ half_orm dev release apply 1.3.5-stage
+        Apply patches without running tests:
+        $ half_orm dev release apply --skip-tests
 
     \b
-    Status: 🚧 Not implemented - planned for future release
+    Output:
+        ✓ Applied 5 patches for version 1.3.6
+        ✓ Tests passed (42 tests)
+
+        Or on failure:
+        ✗ Tests failed
+        <test output>
     """
-    click.echo("🚧 Release testing not implemented yet")
-    click.echo()
-    click.echo("Planned workflow:")
-    click.echo("  1. Restore database from model/schema.sql")
-    click.echo("  2. Apply all patches from release file")
-    click.echo("  3. Run comprehensive tests")
-    click.echo("  4. Validate final state")
-    click.echo()
-    raise NotImplementedError("Release apply not yet implemented")
+    try:
+        # Get repository instance
+        repo = Repo()
+        release_mgr = repo.release_manager
+
+        # Display context
+        click.echo("🔄 Applying all release patches for integration testing...")
+        click.echo()
+
+        # Apply release
+        result = release_mgr.apply_release(run_tests=not skip_tests)
+
+        # Display results
+        version = result['version']
+        patches = result['patches_applied']
+        candidates = result.get('candidates_merged', [])
+        patch_count = len(patches)
+
+        click.echo(f"✓ {utils.Color.green('Patches applied successfully!')}")
+        click.echo()
+        click.echo(f"  Version:  {utils.Color.bold(version)}")
+        click.echo(f"  Patches:  {utils.Color.bold(str(patch_count))}")
+        if candidates:
+            click.echo(f"  Candidates merged: {utils.Color.bold(str(len(candidates)))}")
+        click.echo()
+
+        # Show candidates merged (simulated merges)
+        if candidates:
+            click.echo("  Candidate branches merged (simulated):")
+            for patch_id in candidates:
+                click.echo(f"    • ho-patch/{patch_id}")
+            click.echo()
+
+        # Show patches applied
+        if patches:
+            click.echo("  Applied patches (SQL):")
+            for patch_id in patches:
+                click.echo(f"    • {patch_id}")
+            click.echo()
+
+        # Show test results
+        if skip_tests:
+            click.echo(f"⚠️  {utils.Color.bold('Tests skipped')} (--skip-tests flag)")
+        elif result['tests_passed'] is None:
+            click.echo(f"⚠️  {utils.Color.bold('Tests not run')} (pytest not found)")
+        elif result['tests_passed']:
+            click.echo(f"✓ {utils.Color.green('Tests passed!')}")
+        else:
+            click.echo(f"✗ {utils.Color.red('Tests failed!')}")
+            click.echo()
+            click.echo("Test output:")
+            click.echo(result['test_output'])
+            sys.exit(1)
+
+        click.echo()
+        click.echo("📝 Next steps:")
+        if result['tests_passed'] or result['tests_passed'] is None:
+            click.echo(f"  • Promote to RC: {utils.Color.bold('half_orm dev release promote rc')}")
+        else:
+            click.echo(f"  • Fix failing tests")
+            click.echo(f"  • Re-run: {utils.Color.bold('half_orm dev release apply')}")
+
+    except ReleaseManagerError as e:
+        click.echo(f"❌ {utils.Color.red('Release apply failed:')}", err=True)
+        click.echo(f"   {str(e)}", err=True)
+        sys.exit(1)

{half_orm_dev-0.17.3a4 → half_orm_dev-0.17.3a6}/half_orm_dev/database.py

@@ -93,6 +93,10 @@ class Database:
         if get_release and self.__repo.devel:
             self.__last_release = self.last_release
 
+    @property
+    def name(self):
+        return self.__name
+
     @property
     def last_release(self):
         "Returns the last release"
@@ -177,10 +181,22 @@ class Database:
             *command_args
         )
 
-    def register_release(self, major, minor, patch, changelog=None):
-        "Register the release into half_orm_meta.hop_release"
+    def register_release(self, major, minor, patch, pre_release='', pre_release_num='', changelog=None):
+        """
+        Register the release into half_orm_meta.hop_release.
+
+        Args:
+            major: Major version number
+            minor: Minor version number
+            patch: Patch version number
+            pre_release: Pre-release type ('alpha', 'beta', 'rc', or '' for production)
+            pre_release_num: Pre-release number (e.g., '1' for rc1)
+            changelog: Optional changelog text
+        """
         return self.__model.get_relation_class('half_orm_meta.hop_release')(
-            major=major, minor=minor, patch=patch, changelog=changelog
+            major=major, minor=minor, patch=patch,
+            pre_release=pre_release, pre_release_num=pre_release_num,
+            changelog=changelog
         ).ho_insert()
 
     def _generate_schema_sql(self, version: str, model_dir: Path) -> Path:
@@ -271,6 +287,7 @@ class Database:
 
         # Construct versioned schema file path
         schema_file = model_dir / f"schema-{version}.sql"
+        temp_schema_file = model_dir / f".schema-{version}.sql.tmp"
 
         # Generate schema dump using pg_dump
         try:
@@ -278,16 +295,45 @@ class Database:
                 'pg_dump',
                 self.__name,
                 '--schema-only',
+                '--no-owner',
                 '-f',
-                str(schema_file)
+                str(temp_schema_file)
+            )
+
+            # Filter out version-specific lines for cross-version compatibility
+            content = temp_schema_file.read_text()
+            filtered_lines = []
+            # SET commands that are version-specific and should be removed
+            version_specific_sets = (
+                'SET transaction_timeout',  # PG17+
             )
+            for line in content.split('\n'):
+                # Skip \restrict and \unrestrict lines
+                if line.startswith('\\restrict') or line.startswith('\\unrestrict'):
+                    continue
+                # Skip "-- Dumped from/by" comments (version-specific)
+                if line.startswith('-- Dumped from') or line.startswith('-- Dumped by'):
+                    continue
+                # Skip version-specific SET commands
+                if any(line.startswith(s) for s in version_specific_sets):
+                    continue
+                filtered_lines.append(line)
+
+            schema_file.write_text('\n'.join(filtered_lines))
         except Exception as e:
             raise Exception(f"Failed to generate schema SQL: {e}") from e
+        finally:
+            # Clean up temporary file
+            if temp_schema_file.exists():
+                temp_schema_file.unlink()
 
         # Generate metadata dump (half_orm_meta data only)
+        # Keep only COPY statements to avoid version-specific SET commands
         metadata_file = model_dir / f"metadata-{version}.sql"
+        temp_file = model_dir / f".metadata-{version}.sql.tmp"
 
         try:
+            # Dump to temporary file
             self.execute_pg_command(
                 'pg_dump',
                 self.__name,
@@ -296,10 +342,29 @@ class Database:
                 '--table=half_orm_meta.hop_release',
                 '--table=half_orm_meta.hop_release_issue',
                 '-f',
-                str(metadata_file)
+                str(temp_file)
             )
+
+            # Filter to keep only COPY blocks (COPY ... FROM stdin; ... \.)
+            content = temp_file.read_text()
+            filtered_lines = []
+            in_copy_block = False
+            for line in content.split('\n'):
+                if line.startswith('COPY '):
+                    in_copy_block = True
+                if in_copy_block:
+                    filtered_lines.append(line)
+                if line == '\\.':
+                    in_copy_block = False
+                    filtered_lines.append('')  # Empty line between blocks
+
+            metadata_file.write_text('\n'.join(filtered_lines))
         except Exception as e:
             raise Exception(f"Failed to generate metadata SQL: {e}") from e
+        finally:
+            # Clean up temporary file
+            if temp_file.exists():
+                temp_file.unlink()
 
         # Create or update symlink
         symlink_path = model_dir / "schema.sql"

{half_orm_dev-0.17.3a4 → half_orm_dev-0.17.3a6}/half_orm_dev/patch_manager.py

@@ -1916,7 +1916,7 @@ class PatchManager:
         # This also syncs .hop/ to all active branches automatically via decorator
         try:
             self._repo.commit_and_sync_to_active_branches(
-                message=f"[HOP] move patch #{patch_id} from candidate to stage %{version}"
+                message=f"[HOP] move patch #{patch_id} from candidate to stage %{version}\nFixes #{patch_id}."
             )
         except Exception as e:
             raise PatchManagerError(f"Failed to commit/push changes: {e}")