Matrix-Mirrors/maubot
1
0
Fork 0
mirror of https://github.com/maubot/maubot.git synced 2024-10-01 01:06:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove some unnecessary SQLAlchemy imports that might break 1.4+

Browse Source
This commit is contained in:
Tulir Asokan 2022-03-28 21:20:50 +03:00
parent 98c33e1469
commit ca7c4df349
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maubot/management/api/instance_database.py
View File

@ -20,7 +20,6 @@ from datetime import datetime
from aiohttp import web
from asyncpg import PostgresError
from sqlalchemy import asc, desc, engine, exc
from sqlalchemy.engine.result import ResultProxy, RowProxy
import aiosqlite
from mautrix.util.async_db import Database
@ -134,7 +133,7 @@ def _execute_query_sqlalchemy(
) -> web.Response:
assert isinstance(instance.inst_db, engine.Engine)
try:
res: ResultProxy = instance.inst_db.execute(sql_query)
res = instance.inst_db.execute(sql_query)
except exc.IntegrityError as e:
return resp.sql_integrity_error(e, sql_query)
except exc.OperationalError as e:
@ -144,7 +143,6 @@ def _execute_query_sqlalchemy(
"query": str(sql_query),
}
if res.returns_rows:
row: RowProxy
data["rows"] = [
(
{key: check_type(value) for key, value in row.items()}