tina4-python 3.10.9__tar.gz → 3.10.11__tar.gz

{tina4_python-3.10.9 → tina4_python-3.10.11}/PKG-INFO

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

{tina4_python-3.10.9 → tina4_python-3.10.11}/pyproject.toml

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

{tina4_python-3.10.9 → tina4_python-3.10.11}/tina4_python/frond/engine.py

@@ -269,10 +269,11 @@ def _resolve(expr: str, context: dict):
     value = context
     for part in parts:
         if part.startswith("[") and part.endswith("]"):
-            idx = part[1:-1].strip("'\"")
+            raw_idx = part[1:-1].strip()
             # Slice syntax: value[1:5], value[:10], value[3:]
-            if ":" in idx:
-                slice_parts = idx.split(":", 1)
+            if ":" in raw_idx and not ((raw_idx.startswith('"') and raw_idx.endswith('"')) or (raw_idx.startswith("'") and raw_idx.endswith("'"))):
+                idx_clean = raw_idx.strip("'\"")
+                slice_parts = idx_clean.split(":", 1)
                 s_start = int(slice_parts[0]) if slice_parts[0].strip() else None
                 s_end = int(slice_parts[1]) if slice_parts[1].strip() else None
                 try:
@@ -280,10 +281,20 @@ def _resolve(expr: str, context: dict):
                 except (TypeError, IndexError):
                     return None
             else:
-                try:
-                    idx = int(idx)
-                except ValueError:
-                    pass
+                # Resolve the key: string literal, int literal, or variable
+                if (raw_idx.startswith('"') and raw_idx.endswith('"')) or \
+                   (raw_idx.startswith("'") and raw_idx.endswith("'")):
+                    # String literal: balances["9600.000"]
+                    idx = raw_idx[1:-1]
+                else:
+                    try:
+                        # Integer literal: items[0]
+                        idx = int(raw_idx)
+                    except ValueError:
+                        # Variable key: balances[k] or balances[cb.glcode]
+                        idx = _resolve(raw_idx, context)
+                        if idx is None:
+                            return None
                 try:
                     value = value[idx]
                 except (KeyError, IndexError, TypeError):

{tina4_python-3.10.9 → tina4_python-3.10.11}/tina4_python/migration/runner.py

@@ -24,16 +24,34 @@ def _ensure_tracking_table(db):
     When detected, adds the missing column and backfills from `description`.
     """
     if not db.table_exists("tina4_migration"):
-        db.execute("""
-            CREATE TABLE tina4_migration (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                migration_id TEXT NOT NULL UNIQUE,
-                description TEXT,
-                batch INTEGER NOT NULL DEFAULT 1,
-                executed_at TEXT NOT NULL,
-                passed INTEGER NOT NULL DEFAULT 1
-            )
-        """)
+        if _is_firebird(db):
+            # Firebird: no AUTOINCREMENT, no TEXT type, use generator for IDs
+            try:
+                db.execute("CREATE GENERATOR GEN_TINA4_MIGRATION_ID")
+                db.commit()
+            except Exception:
+                pass  # Generator may already exist
+            db.execute("""
+                CREATE TABLE tina4_migration (
+                    id INTEGER NOT NULL PRIMARY KEY,
+                    migration_id VARCHAR(500) NOT NULL UNIQUE,
+                    description VARCHAR(500),
+                    batch INTEGER DEFAULT 1 NOT NULL,
+                    executed_at VARCHAR(50) NOT NULL,
+                    passed INTEGER DEFAULT 1 NOT NULL
+                )
+            """)
+        else:
+            db.execute("""
+                CREATE TABLE tina4_migration (
+                    id INTEGER PRIMARY KEY AUTOINCREMENT,
+                    migration_id TEXT NOT NULL UNIQUE,
+                    description TEXT,
+                    batch INTEGER NOT NULL DEFAULT 1,
+                    executed_at TEXT NOT NULL,
+                    passed INTEGER NOT NULL DEFAULT 1
+                )
+            """)
         db.commit()
         return
 
@@ -43,7 +61,8 @@ def _ensure_tracking_table(db):
     except Exception:
         # migration_id column doesn't exist — v2 schema, upgrade it
         try:
-            db.execute("ALTER TABLE tina4_migration ADD migration_id TEXT")
+            col_type = "VARCHAR(500)" if _is_firebird(db) else "TEXT"
+            db.execute(f"ALTER TABLE tina4_migration ADD migration_id {col_type}")
             db.commit()
         except Exception:
             pass  # Column may already exist on some engines
@@ -70,7 +89,8 @@ def _ensure_tracking_table(db):
             db.fetch_one("SELECT executed_at FROM tina4_migration WHERE 1=0")
         except Exception:
             try:
-                db.execute("ALTER TABLE tina4_migration ADD executed_at TEXT DEFAULT ''")
+                col_type = "VARCHAR(50)" if _is_firebird(db) else "TEXT"
+                db.execute(f"ALTER TABLE tina4_migration ADD executed_at {col_type} DEFAULT ''")
                 db.commit()
             except Exception:
                 pass
@@ -252,10 +272,19 @@ def migrate(db, migration_folder: str = "migrations", delimiter: str = ";") -> l
             now = datetime.now(timezone.utc).isoformat()
             # Extract description from filename (supports both 000001_ and YYYYMMDDHHMMSS_ prefixes)
             desc = re.sub(r"^\d+_", "", migration_id, count=1).replace("_", " ")
-            db.execute(
-                "INSERT INTO tina4_migration (migration_id, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, 1)",
-                [migration_id, desc, batch, now],
-            )
+            if _is_firebird(db):
+                # Firebird: generate ID from sequence
+                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_id, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, ?, 1)",
+                    [next_id, migration_id, desc, batch, now],
+                )
+            else:
+                db.execute(
+                    "INSERT INTO tina4_migration (migration_id, description, batch, executed_at, passed) VALUES (?, ?, ?, ?, 1)",
+                    [migration_id, desc, batch, now],
+                )
             db.commit()
             ran.append(sql_file.name)