Merge branch 'master' into python3.5

mautrix_telegram/db.py

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-from sqlalchemy import Column, UniqueConstraint, ForeignKey, Integer, String
+from sqlalchemy import Column, UniqueConstraint, ForeignKey, ForeignKeyConstraint, Integer, String
 from sqlalchemy.orm import relationship
 
 from .base import Base
@@ -51,6 +51,18 @@ class Message(Base):
     __table_args__ = (UniqueConstraint('mxid', 'mx_room', 'tg_space', name='_mx_id_room'),)
 
 
+class UserPortal(Base):
+    query = None
+    __tablename__ = "user_portal"
+
+    user = Column(Integer, ForeignKey("user.tgid"), primary_key=True)
+    portal = Column(Integer, primary_key=True)
+    portal_receiver = Column(Integer, primary_key=True)
+
+    __table_args__ = (ForeignKeyConstraint(("portal", "portal_receiver"),
+                                           ("portal.tgid", "portal.tg_receiver")),)
+
+
 class User(Base):
     query = None
     __tablename__ = "user"
@@ -59,7 +71,10 @@ class User(Base):
     tgid = Column(Integer, nullable=True)
     tg_username = Column(String, nullable=True)
     saved_contacts = Column(Integer, default=0)
-    contacts = relationship("Contact", uselist=True)
+    contacts = relationship("Contact", uselist=True,
+                            cascade="save-update, merge, delete, delete-orphan")
+    portals = relationship("Portal", secondary="user_portal", single_parent=True,
+                           cascade="save-update, merge, delete, delete-orphan")
 
 
 class Contact(Base):
@@ -83,5 +98,6 @@ class Puppet(Base):
 def init(db_session):
     Portal.query = db_session.query_property()
     Message.query = db_session.query_property()
+    UserPortal.query = db_session.query_property()
     User.query = db_session.query_property()
     Puppet.query = db_session.query_property()