From fecf068455f49c09b395bd8d1e6a410fd6747d27 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Thu, 21 Mar 2019 13:48:06 +0200 Subject: [PATCH] Revert switching to @as_declarative for SQLAlchemy base class This reverts commit 1da113393467e8a30c4b1f0a662b94a5945c43d7 and a part of 2cf9dcafd9a67804dee55d8ce5b27d1632e45f19 --- mautrix_telegram/db/base.py | 7 ++++--- mautrix_telegram/scripts/dbms_migrate/__main__.py | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mautrix_telegram/db/base.py b/mautrix_telegram/db/base.py index a91cc82c..bbca82a7 100644 --- a/mautrix_telegram/db/base.py +++ b/mautrix_telegram/db/base.py @@ -20,11 +20,10 @@ from sqlalchemy import Table from sqlalchemy.engine.base import Engine from sqlalchemy.engine.result import RowProxy from sqlalchemy.sql.base import ImmutableColumnCollection -from sqlalchemy.ext.declarative import as_declarative +from sqlalchemy.ext.declarative import declarative_base -@as_declarative() -class Base: +class BaseBase: db = None # type: Engine t = None # type: Table __table__ = None # type: Table @@ -55,3 +54,5 @@ class Base: def delete(self) -> None: with self.db.begin() as conn: conn.execute(self.t.delete().where(self._edit_identity)) + +Base = declarative_base(cls=BaseBase) diff --git a/mautrix_telegram/scripts/dbms_migrate/__main__.py b/mautrix_telegram/scripts/dbms_migrate/__main__.py index 72dc1ce6..e9edfffd 100644 --- a/mautrix_telegram/scripts/dbms_migrate/__main__.py +++ b/mautrix_telegram/scripts/dbms_migrate/__main__.py @@ -23,6 +23,7 @@ def log(message, end="\n"): def connect(to): import mautrix_telegram.db.base as base + base.Base = declarative_base(cls=base.BaseBase) from mautrix_telegram.db import (Portal, Message, UserPortal, User, RoomState, UserProfile, Contact, Puppet, BotChat, TelegramFile) db_engine = sql.create_engine(to)