Remove SQLAlchemy state store stuff. Fixes #147

Author: tulir

docs/api/mautrix.client.state_store/index.rst

@@ -13,5 +13,4 @@ Implementations
 
    In-memory<memory>
    Async database (asyncpg/aiosqlite)<asyncpg>
-   Legacy database (SQLAlchemy)<sqlalchemy>
    Flat file<file>

docs/api/mautrix.client.state_store/sqlalchemy.rst

@@ -1,4 +1,4 @@
 from .file import FileASStateStore
 from .memory import ASStateStore
 
-__all__ = ["FileASStateStore", "ASStateStore", "sqlalchemy", "asyncpg"]
+__all__ = ["FileASStateStore", "ASStateStore", "asyncpg"]

mautrix/appservice/state_store/__init__.py

@@ -28,29 +28,6 @@ async def is_encrypted(self, room_id: RoomID) -> bool:
         return portal.encrypted if portal else False
 
 
-try:
-    from mautrix.client.state_store.sqlalchemy import RoomState, UserProfile
-
-    class SQLCryptoStateStore(BaseCryptoStateStore):
-        @staticmethod
-        async def find_shared_rooms(user_id: UserID) -> list[RoomID]:
-            return [profile.room_id for profile in UserProfile.find_rooms_with_user(user_id)]
-
-        @staticmethod
-        async def get_encryption_info(room_id: RoomID) -> RoomEncryptionStateEventContent | None:
-            state = RoomState.get(room_id)
-            if not state:
-                return None
-            return state.encryption
-
-except ImportError:
-    if __optional_imports__:
-        raise
-    UserProfile = None
-    RoomState = None
-    SQLCryptoStateStore = None
-
-
 class PgCryptoStateStore(BaseCryptoStateStore):
     db: Database
 

mautrix/appservice/state_store/sqlalchemy.py

@@ -41,13 +41,6 @@
 from .. import bridge as br
 from .crypto_state_store import PgCryptoStateStore
 
-try:
-    from mautrix.client.state_store.sqlalchemy import UserProfile
-except ImportError:
-    if __optional_imports__:
-        raise
-    UserProfile = None
-
 
 class EncryptionManager:
     loop: asyncio.AbstractEventLoop

mautrix/bridge/crypto_state_store.py

@@ -1 +1 @@
-__all__ = ["asyncpg", "sqlalchemy"]
+__all__ = ["asyncpg"]

mautrix/bridge/e2ee.py

@@ -10,5 +10,4 @@
     "MemorySyncStore",
     "SyncStore",
     "asyncpg",
-    "sqlalchemy",
 ]