tina4-python 3.13.72__tar.gz → 3.13.74__tar.gz

{tina4_python-3.13.72 → tina4_python-3.13.74}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 3.13.72
+Version: 3.13.74
 Summary: Tina4 Python v3 — Zero-dependency, lightweight web framework
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 License: MIT

{tina4_python-3.13.72 → tina4_python-3.13.74}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "3.13.72"
+version = "3.13.74"
 description = "Tina4 Python v3 — Zero-dependency, lightweight web framework"
 authors = [
     {name = "Andre van Zuydam", email = "andrevanzuydam@gmail.com"}

{tina4_python-3.13.72 → tina4_python-3.13.74}/tina4_python/CLAUDE.md

@@ -961,7 +961,7 @@ uv run tina4python migrate
 
 - SQL files live in `migrations/` folder, named `NNNNNN_description.sql` (6-digit sequence)
 - Files are executed in **numeric-prefix order** (`9_` before `10_`) and split on the `;` delimiter. A file without a numeric/timestamp prefix logs a warning — its order is undefined
-- State is tracked (row-existence) in the `tina4_migration` table (auto-created per engine): a migration runs once — if a row for it exists, it is skipped. (A vestigial `passed` column exists for back-compat; only applied = `passed=1` rows are ever written — failures are never recorded as `passed=0`.)
+- State is tracked in the `tina4_migration` table (auto-created per engine, canonical columns `id, migration_name VARCHAR(500) NOT NULL UNIQUE, description VARCHAR(500), batch INTEGER NOT NULL DEFAULT 1, executed_at VARCHAR(50) NOT NULL, passed INTEGER NOT NULL DEFAULT 1` — identical across all four frameworks). A migration is **applied** when a row exists for it with `passed = 1` (the applied-read is `WHERE passed = 1`). `migrate()` writes **only `passed = 1` rows**: on a failure the file's transaction is rolled back and **no row is written** for it (it is NOT recorded as `passed=0`), and `migrate()` raises. The public `record_migration(name, batch, passed=...)` API can write a `passed=0` row; any `passed=0` row (including one carried over from a v2 table) is treated as **not applied**, so it is reported pending. A leftover `passed=0` row (a prior failure or a v2 carry-over) **re-applies cleanly**: on the next `migrate()` the success path deletes any existing row for that `migration_name` before writing the fresh `passed=1` row, so the migration runs again instead of colliding on the unique `migration_name` — the bookkeeping table holds at most one row per migration with its latest state. The v2->v3 upgrade logs a warning naming any `passed=0` rows so you know which ones will re-run.
 - **Each migration FILE is wrapped in its own transaction**: on a failure the file rolls back and `migrate()` **raises** (it does not write `passed=0`, delete anything, or `sys.exit`). Already-applied files stay applied — fix the bad file and re-run. The explicit `tina4 migrate` CLI surfaces the raise as a non-zero exit; startup auto-migration logs it and the service still boots (see TINA4_AUTO_MIGRATE above).
 - **Atomicity caveat:** per-file transactions are truly atomic only on engines with **transactional DDL (PostgreSQL)**. MySQL, Firebird, and SQLite auto-commit DDL, so a multi-statement migration that fails midway on those engines leaves earlier statements applied — keep one logical change per file. CREATE TABLE / ALTER-ADD are made idempotent on Firebird/MSSQL (existence-checked) so a re-run doesn't error.
 

{tina4_python-3.13.72 → tina4_python-3.13.74}/tina4_python/dev_admin/__init__.py

@@ -1792,7 +1792,7 @@ async def _api_connections_test(request, response):
     if not url:
         return response({"success": False, "error": "No connection URL provided"})
     try:
-        from tina4_python.Database import Database
+        from tina4_python.database import Database
         db = Database(url, username, password)
         version = ""
         table_count = 0

{tina4_python-3.13.72 → tina4_python-3.13.74}/tina4_python/migration/runner.py

@@ -265,7 +265,7 @@ def _upgrade_v2_to_v3(db, migration_folder: str | None) -> None:
             logger.error(f"v2→v3 upgrade: failed to backfill {desc!r}: {e}")
 
     note = (
-        f" ({failed_in_v2} were marked passed=0 in v2 — review manually)"
+        f" ({failed_in_v2} were marked passed=0 in v2 and will re-apply on the next migrate)"
         if failed_in_v2
         else ""
     )
@@ -629,6 +629,32 @@ def _should_skip_create_table(db, stmt: str) -> str | None:
     return None
 
 
+def _record_applied(db, name: str, desc: str, batch: int, passed: int = 1) -> None:
+    """Write (or overwrite) the tracking row for a migration.
+
+    Deletes any existing row for this migration_name first, so a leftover
+    passed=0 row (a prior failure, or a v2 carry-over) is superseded and the
+    migration re-applies cleanly instead of colliding on the UNIQUE
+    migration_name. DELETE+INSERT is portable across every engine (no UPSERT
+    dialect variance), leaving at most one row per migration_name with the
+    latest recorded state.
+    """
+    now = datetime.now(timezone.utc).isoformat()
+    db.execute("DELETE FROM tina4_migration WHERE migration_name = ?", [name])
+    if _is_firebird(db):
+        row = db.fetch_one("SELECT GEN_ID(GEN_TINA4_MIGRATION_ID, 1) AS next_id FROM RDB$DATABASE")
+        next_id = row["next_id"] if row else 1
+        db.execute(
+            "INSERT INTO tina4_migration (id, migration_name, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, ?, ?)",
+            [next_id, name, desc, batch, now, passed],
+        )
+    else:
+        db.execute(
+            "INSERT INTO tina4_migration (migration_name, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, ?)",
+            [name, desc, batch, now, passed],
+        )
+
+
 def _migrate(db, migration_folder: str = "migrations", delimiter: str = ";") -> list[str]:
     """Run all pending migrations (internal implementation).
 
@@ -688,21 +714,11 @@ def _migrate(db, migration_folder: str = "migrations", delimiter: str = ";") ->
                     if db.execute(stmt) is False:
                         raise RuntimeError(f"Migration failed: {db.get_error() or stmt[:80]}")
 
-            # Record as passed
-            now = datetime.now(timezone.utc).isoformat()
+            # Record as passed — supersede any leftover row for this migration
+            # (a prior passed=0 failure or a v2 carry-over) so it re-applies
+            # cleanly instead of colliding on the UNIQUE migration_name.
             desc = re.sub(r"^\d+_", "", migration_name, count=1).replace("_", " ")
-            if _is_firebird(db):
-                row = db.fetch_one("SELECT GEN_ID(GEN_TINA4_MIGRATION_ID, 1) AS next_id FROM RDB$DATABASE")
-                next_id = row["next_id"] if row else 1
-                db.execute(
-                    "INSERT INTO tina4_migration (id, migration_name, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, ?, 1)",
-                    [next_id, migration_name, desc, batch, now],
-                )
-            else:
-                db.execute(
-                    "INSERT INTO tina4_migration (migration_name, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, 1)",
-                    [migration_name, desc, batch, now],
-                )
+            _record_applied(db, migration_name, desc, batch, passed=1)
             db.commit()
             ran.append(mig_file.name)
 
@@ -912,20 +928,8 @@ class Migration:
             passed: 1 if the migration succeeded (default), 0 if it failed.
         """
         _ensure_tracking_table(self._db, self._dir)
-        now = datetime.now(timezone.utc).isoformat()
         desc = re.sub(r"^\d+_", "", name, count=1).replace("_", " ")
-        if _is_firebird(self._db):
-            row = self._db.fetch_one("SELECT GEN_ID(GEN_TINA4_MIGRATION_ID, 1) AS next_id FROM RDB$DATABASE")
-            next_id = row["next_id"] if row else 1
-            self._db.execute(
-                "INSERT INTO tina4_migration (id, migration_name, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, ?, ?)",
-                [next_id, name, desc, batch, now, passed],
-            )
-        else:
-            self._db.execute(
-                "INSERT INTO tina4_migration (migration_name, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, ?)",
-                [name, desc, batch, now, passed],
-            )
+        _record_applied(self._db, name, desc, batch, passed=passed)
 
     def remove_migration_record(self, name: str) -> None:
         """Delete a migration record from the tracking table by migration ID.