matrx-orm 3.1.235__tar.gz → 3.1.236__tar.gz

{matrx_orm-3.1.235 → matrx_orm-3.1.236}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: matrx-orm
-Version: 3.1.235
+Version: 3.1.236
 Summary: Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching
 Project-URL: Homepage, https://github.com/AI-Matrix-Engine/aidream-current
 Project-URL: Repository, https://github.com/AI-Matrix-Engine/aidream-current

{matrx_orm-3.1.235 → matrx_orm-3.1.236}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "3.1.235"
+version = "3.1.236"
 description = "Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching"
 readme = "README.md"
 license = { text = "MIT" }

{matrx_orm-3.1.235 → matrx_orm-3.1.236}/tests/level1/test_borrowed_role_never_reaches_server_calls.py

@@ -91,7 +91,7 @@ class ServerBackend:
         self.in_tx = False
         self.local_role = None
 
-    async def execute(self, sql: str, *args: Any, timeout: Any = None) -> str:  # noqa: ASYNC109 — mirrors asyncpg's connection signature
+    async def execute(self, sql: str, *args: Any, **_kw: Any) -> str:  # noqa: ASYNC109 — mirrors asyncpg's connection signature
         self.statements.append(sql)
         s = sql.strip().upper()
         if s == "BEGIN":
@@ -111,7 +111,7 @@ class ServerBackend:
         self.server_calls += 1
         return [{"id": "row-1"}]
 
-    async def fetch(self, sql: str, *args: Any, timeout: Any = None) -> list[dict[str, Any]]:  # noqa: ASYNC109 — mirrors asyncpg's connection signature
+    async def fetch(self, sql: str, *args: Any, **_kw: Any) -> list[dict[str, Any]]:  # noqa: ASYNC109 — mirrors asyncpg's connection signature
         self.statements.append(sql)
         if "set_config" in sql:
             self._apply_set_config(sql, args)
@@ -120,7 +120,7 @@ class ServerBackend:
             return self._server_only()
         return []
 
-    async def fetchval(self, sql: str, *args: Any, timeout: Any = None) -> Any:  # noqa: ASYNC109 — mirrors asyncpg's connection signature
+    async def fetchval(self, sql: str, *args: Any, **_kw: Any) -> Any:  # noqa: ASYNC109 — mirrors asyncpg's connection signature
         self.statements.append(sql)
         if "current_user" in sql:
             return self.current_user
@@ -131,7 +131,7 @@ class ServerBackend:
             return self._server_only()[0]["id"]
         return None
 
-    async def fetchrow(self, sql: str, *args: Any, timeout: Any = None) -> Any:  # noqa: ASYNC109 — mirrors asyncpg's connection signature
+    async def fetchrow(self, sql: str, *args: Any, **_kw: Any) -> Any:  # noqa: ASYNC109 — mirrors asyncpg's connection signature
         if "set_config" in sql:
             self._apply_set_config(sql, args)
         if "current_user" in sql:

{matrx_orm-3.1.235 → matrx_orm-3.1.236}/tests/level1/test_lock_contention_retry.py

@@ -76,6 +76,18 @@ class _FakeConn:
             raise exc
         return [{"id": "row"}]
 
+    # The borrowed-role re-run (foreign_session_state) pins a transaction, reads the
+    # role and resets it before re-running the statement once.
+    @asynccontextmanager
+    async def transaction(self):
+        yield
+
+    async def execute(self, query: str, *args: object, **_kw: object) -> str:
+        return "SELECT 1"
+
+    async def fetchrow(self, query: str, *args: object, **_kw: object):
+        return {"borrowed": "postgres", "login": "postgres"}
+
 
 @pytest.fixture
 def fake_pool(monkeypatch):
@@ -203,11 +215,13 @@ async def test_inside_a_transaction_it_is_NEVER_reissued(fake_pool, monkeypatch)
 @pytest.mark.asyncio
 async def test_a_permission_denial_is_never_retried_as_contention(fake_pool):
     denial = asyncpg.exceptions.InsufficientPrivilegeError("permission denied")
-    conn = fake_pool([denial, None])
+    conn = fake_pool([denial, denial, None, None])
 
     with pytest.raises(PermissionDeniedError):
         await AsyncDatabaseManager.execute_query(
             "test", SELECT, "user", verify_empty=False
         )
 
-    assert conn.calls == 1
+    # Exactly ONE re-run, as the login role (a borrowed pooler role is reset —
+    # foreign_session_state); never the contention loop's budget.
+    assert conn.calls == 2

{matrx_orm-3.1.235 → matrx_orm-3.1.236}/tests/level1/test_transaction_gucs_one_round_trip.py

@@ -66,13 +66,14 @@ async def test_begin_sets_ceilings_and_declared_context_in_one_round_trip(monkey
     gucs = [call for call in conn.calls if "set_config" in call[0]]
     assert len(gucs) == 1, statements
     sql, args = gucs[0]
-    assert sql.count("set_config(") == 5
+    assert sql.count("set_config(") == 6
     assert args == (
         "restrict_nonsystem_relation_kind", "",
         "lock_timeout", "5000",
         "app.actor_tier", "agent",
         "app.actor_system", "flashcards",
         "app.actor_agent", "a1",
+        "role", "none",  # a borrowed role is reset; always last
     )
 
 
@@ -84,10 +85,15 @@ async def test_nothing_declared_emits_only_the_foreign_state_clear(monkeypatch)
     configure_session_context(None)
     async with transaction_module.transaction("quiet"):
         pass
-    # The one GUC every transaction carries: another pooler client's leaked
-    # restrict_nonsystem_relation_kind is cleared (matrx_orm.core.foreign_session_state).
-    assert [sql for sql, _ in conn.calls] == ["BEGIN", "SELECT set_config($1, $2, true)", "COMMIT"]
-    assert conn.calls[1][1] == ("restrict_nonsystem_relation_kind", "")
+    # What every transaction carries: another pooler client's leaked
+    # restrict_nonsystem_relation_kind is cleared and a borrowed role is reset to the
+    # login role (matrx_orm.core.foreign_session_state).
+    assert [sql for sql, _ in conn.calls] == [
+        "BEGIN",
+        "SELECT set_config($1, $2, true), set_config($3, $4, true)",
+        "COMMIT",
+    ]
+    assert conn.calls[1][1] == ("restrict_nonsystem_relation_kind", "", "role", "none")
 
 
 def test_a_bad_guc_name_is_refused_before_it_reaches_sql() -> None: