half-orm-dev 0.17.2a11__tar.gz → 0.17.3a2__tar.gz

{half_orm_dev-0.17.2a11/half_orm_dev.egg-info → half_orm_dev-0.17.3a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.2a11
+Version: 0.17.3a2
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later
@@ -23,7 +23,7 @@ Requires-Dist: GitPython
 Requires-Dist: click
 Requires-Dist: pydash
 Requires-Dist: pytest
-Requires-Dist: half_orm<0.18.0,>=0.17.0
+Requires-Dist: half_orm<0.18.0,>=0.17.1
 Requires-Dist: tomli>=2.0.0; python_version < "3.11"
 Requires-Dist: tomli_w>=1.0.0
 Dynamic: license-file

{half_orm_dev-0.17.2a11 → half_orm_dev-0.17.3a2}/half_orm_dev/database.py

@@ -1362,25 +1362,23 @@ class Database:
                 pass
         """
         try:
-            result = self._execute_pg_command(
-                self.__name,
-                self._get_connection_params(),
-                *['psql', '-d', 'postgres', '-t', '-A', '-c', 'SHOW server_version;'],
-            )
+            # Use existing database connection via half_orm Model API
+            # Query returns: "PostgreSQL 16.1 (Ubuntu 16.1-1.pgdg22.04+1) on ..."
+            result = self.__model.execute_query('SELECT version()')
+            version_str = result[0]['version']
 
-            # Output format: "16.1 (Ubuntu 16.1-1.pgdg22.04+1)"
-            # Extract version: "16.1"
-            version_str = result.stdout.strip().split()[0]
+            # Extract version number: split on space, take 2nd element (e.g., "16.1")
+            # Then split on dot to get [major, minor, patch]
+            version_parts = [int(part) for part in version_str.split(' ')[1].split('.')]
 
-            # Parse major.minor
-            parts = version_str.split('.')
-            major = int(parts[0])
-            minor = int(parts[1]) if len(parts) > 1 else 0
+            # Return (major, minor) tuple
+            major = version_parts[0]
+            minor = version_parts[1] if len(version_parts) > 1 else 0
 
             return (major, minor)
 
         except Exception as e:
             raise DatabaseError(
                 f"Failed to get PostgreSQL version: {e}\n"
-                f"Ensure PostgreSQL is installed and accessible."
-            )
+                f"Ensure database connection is available."
+            )

{half_orm_dev-0.17.2a11 → half_orm_dev-0.17.3a2}/half_orm_dev/repo.py

@@ -2186,26 +2186,35 @@ See docs/half_orm_dev.md for complete documentation.
         # Validation passed
         return True
 
+    def _reset_database_schemas(self) -> None:
+        """Drop all user schemas with CASCADE (including half_orm_meta)."""
+        # Get user schemas from half_orm metadata
+        relations = self.model.desc()
+        schemas = {'half_orm_meta', 'half_orm_meta.view'}
+        _ = [schemas.add(rel[1][1]) for rel in relations]
+
+        # Drop each schema with CASCADE
+        for schema_name in schemas:
+            self.model.execute_query(f'DROP SCHEMA IF EXISTS "{schema_name}" CASCADE')
+
     def restore_database_from_schema(self) -> None:
         """
         Restore database from model/schema.sql and model/metadata-X.Y.Z.sql.
 
-        Restores database to clean production state by dropping and recreating
-        database, then loading schema structure and half_orm_meta data. This provides
+        Restores database to clean production state by dropping all user schemas
+        and reloading schema structure and half_orm_meta data. This provides
         a clean baseline before applying patch files during patch development.
 
         Process:
         1. Verify model/schema.sql exists (file or symlink)
-        2. Disconnect halfORM Model from database
-        3. Drop existing database using dropdb command
-        4. Create fresh empty database using createdb command
-        5. Load schema structure from model/schema.sql using psql -f
-        5b. Load half_orm_meta data from model/metadata-X.Y.Z.sql using psql -f (if exists)
-        6. Reconnect halfORM Model to restored database
+        2. Drop all user schemas with CASCADE (no superuser privileges needed)
+        3. Load schema structure from model/schema.sql using psql -f
+        4. Load half_orm_meta data from model/metadata-X.Y.Z.sql using psql -f (if exists)
+        5. Reload halfORM Model metadata cache
 
-        The method uses Database.execute_pg_command() for all PostgreSQL
-        operations (dropdb, createdb, psql) with connection parameters from
-        repository configuration.
+        The method uses DROP SCHEMA CASCADE instead of dropdb/createdb, allowing
+        operation without CREATEDB privilege or superuser access. This makes it
+        compatible with cloud databases (RDS, Azure) and restricted environments.
 
         File Resolution:
         - Accepts model/schema.sql as regular file or symlink
@@ -2216,8 +2225,7 @@ See docs/half_orm_dev.md for complete documentation.
 
         Error Handling:
         - Raises RepoError if model/schema.sql not found
-        - Raises RepoError if dropdb fails
-        - Raises RepoError if createdb fails
+        - Raises RepoError if schema drop fails
         - Raises RepoError if psql schema load fails
         - Raises RepoError if psql metadata load fails (when file exists)
         - Database state rolled back on any failure
@@ -2255,8 +2263,9 @@ See docs/half_orm_dev.md for complete documentation.
                 # Handle error: check schema.sql exists, verify permissions
 
         Notes:
-            - Silences psql output using stdout=subprocess.DEVNULL
-            - Uses Model.ping() for reconnection after restoration
+            - Uses DROP SCHEMA CASCADE - no superuser or CREATEDB privilege required
+            - Works on cloud databases (AWS RDS, Azure Database, etc.)
+            - Uses Model.reconnect(reload=True) to refresh metadata cache
             - Supports both schema.sql file and schema.sql -> schema-X.Y.Z.sql symlink
             - Metadata file is optional (backward compatibility with older schemas)
             - All PostgreSQL commands use repository connection configuration
@@ -2272,26 +2281,10 @@ See docs/half_orm_dev.md for complete documentation.
             )
 
         try:
-            # 2. Disconnect Model from database
-            self.model.disconnect()
-            pg_version = self.database.get_postgres_version()
-            drop_cmd = ['dropdb', self.name]
-            if pg_version > (13, 0):
-                drop_cmd.append('--force')
-
-            # 3. Drop existing database
-            try:
-                self.database.execute_pg_command(*drop_cmd)
-            except Exception as e:
-                raise RepoError(f"Failed to drop database: {e}") from e
-
-            # 4. Create fresh empty database
-            try:
-                self.database.execute_pg_command('createdb', self.name)
-            except Exception as e:
-                raise RepoError(f"Failed to create database: {e}") from e
+            # 2. Drop all schemas (no superuser privileges needed)
+            self._reset_database_schemas()
 
-            # 5. Load schema from model/schema.sql
+            # 3. Load schema from model/schema.sql
             try:
                 self.database.execute_pg_command(
                     'psql', '-d', self.name, '-f', str(schema_path)
@@ -2299,7 +2292,7 @@ See docs/half_orm_dev.md for complete documentation.
             except Exception as e:
                 raise RepoError(f"Failed to load schema from {schema_path.name}: {e}") from e
 
-            # 5b. Load metadata from model/metadata-X.Y.Z.sql (if exists)
+            # 4. Load metadata from model/metadata-X.Y.Z.sql (if exists)
             metadata_path = self._deduce_metadata_path(schema_path)
 
             if metadata_path and metadata_path.exists():
@@ -2315,8 +2308,8 @@ See docs/half_orm_dev.md for complete documentation.
                     ) from e
             # else: metadata file doesn't exist, continue without error (backward compatibility)
 
-            # 6. Reconnect Model to restored database
-            self.model.ping()
+            # 5. Reload half_orm metadata cache
+            self.model.reconnect(reload=True)
 
         except RepoError:
             # Re-raise RepoError as-is

half_orm_dev-0.17.3a2/half_orm_dev/version.txt

@@ -0,0 +1 @@
+0.17.3-a2

{half_orm_dev-0.17.2a11 → half_orm_dev-0.17.3a2/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.2a11
+Version: 0.17.3a2
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later
@@ -23,7 +23,7 @@ Requires-Dist: GitPython
 Requires-Dist: click
 Requires-Dist: pydash
 Requires-Dist: pytest
-Requires-Dist: half_orm<0.18.0,>=0.17.0
+Requires-Dist: half_orm<0.18.0,>=0.17.1
 Requires-Dist: tomli>=2.0.0; python_version < "3.11"
 Requires-Dist: tomli_w>=1.0.0
 Dynamic: license-file

{half_orm_dev-0.17.2a11 → half_orm_dev-0.17.3a2}/half_orm_dev.egg-info/requires.txt

@@ -2,7 +2,7 @@ GitPython
 click
 pydash
 pytest
-half_orm<0.18.0,>=0.17.0
+half_orm<0.18.0,>=0.17.1
 tomli_w>=1.0.0
 
 [:python_version < "3.11"]

{half_orm_dev-0.17.2a11 → half_orm_dev-0.17.3a2}/setup.py

@@ -11,11 +11,21 @@ from pathlib import Path
 from setuptools import setup
 
 
+# Special minimum version requirements for half_orm
+# List of (major, minor, min_patch, max_patch, required_half_orm_version)
+# Example: (0, 17, 3, 5, '0.17.1') means:
+#   for half_orm_dev 0.17.x where 3 <= x < 5, require half_orm >= 0.17.1
+HALF_ORM_MIN_VERSIONS = [
+    (0, 17, 3, None, '0.17.1'),  # 0.17.3+ requires half_orm >= 0.17.1 (CustomGroup support)
+]
+
+
 def get_half_orm_version_constraint():
     """
     Calculate half_orm version constraint from half_orm_dev version.
 
-    For version X.Y.Z[-xxx], returns: half_orm>=X.Y.0,<X.(Y+1).0
+    For version X.Y.Z[-xxx], returns: half_orm>=X.Y.MIN,<X.(Y+1).0
+    where MIN is determined by HALF_ORM_MIN_VERSIONS or defaults to 0
     """
     version_file = Path(__file__).parent / "half_orm_dev" / "version.txt"
     version_text = version_file.read_text(encoding="utf-8").strip()
@@ -27,10 +37,18 @@ def get_half_orm_version_constraint():
         raise ValueError(f"Invalid version format in version.txt: {version_text}")
 
     major, minor, patch = match.groups()
-    major, minor = int(major), int(minor)
+    major, minor, patch = int(major), int(minor), int(patch)
+
+    # Check for special minimum version requirements
+    min_version = f"{major}.{minor}.0"  # Default
+    for req_major, req_minor, min_patch, max_patch, required_version in HALF_ORM_MIN_VERSIONS:
+        if major == req_major and minor == req_minor:
+            # Check if patch is in range [min_patch, max_patch)
+            if patch >= min_patch:
+                if max_patch is None or patch < max_patch:
+                    min_version = required_version
+                    break
 
-    # Generate constraint: half_orm>=X.Y.0,<X.(Y+1).0
-    min_version = f"{major}.{minor}.0"
     max_version = f"{major}.{minor + 1}.0"
 
     return f"half_orm>={min_version},<{max_version}"

half_orm_dev-0.17.2a11/half_orm_dev/version.txt

@@ -1 +0,0 @@
-0.17.2-a11