From dc85754b1e0e31c8dded106cceebe8c171125a78 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 29 May 2018 15:17:08 +0300 Subject: [PATCH] Fix postgres compatibility --- ...ad2868bc_move_sessions_to_main_database.py | 36 +++++++++---------- ...7d84380b6_add_timestamp_to_telegramfile.py | 2 +- .../versions/97d2a942bcf8_initial_revision.py | 2 +- mautrix_telegram/db.py | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/alembic/versions/501dad2868bc_move_sessions_to_main_database.py b/alembic/versions/501dad2868bc_move_sessions_to_main_database.py index 1878f30b..c9883534 100644 --- a/alembic/versions/501dad2868bc_move_sessions_to_main_database.py +++ b/alembic/versions/501dad2868bc_move_sessions_to_main_database.py @@ -19,31 +19,31 @@ depends_on = None def upgrade(): Session = op.create_table('telethon_sessions', - sa.Column('session_id', sa.VARCHAR(), nullable=False), - sa.Column('dc_id', sa.INTEGER(), nullable=False), - sa.Column('server_address', sa.VARCHAR(), nullable=True), - sa.Column('port', sa.INTEGER(), nullable=True), - sa.Column('auth_key', sa.BLOB(), nullable=True), + sa.Column('session_id', sa.String, nullable=False), + sa.Column('dc_id', sa.Integer, nullable=False), + sa.Column('server_address', sa.String, nullable=True), + sa.Column('port', sa.Integer, nullable=True), + sa.Column('auth_key', sa.LargeBinary, nullable=True), sa.PrimaryKeyConstraint('session_id', 'dc_id')) SentFile = op.create_table('telethon_sent_files', - sa.Column('session_id', sa.VARCHAR(), nullable=False), - sa.Column('md5_digest', sa.BLOB(), nullable=False), - sa.Column('file_size', sa.INTEGER(), nullable=False), - sa.Column('type', sa.INTEGER(), nullable=False), - sa.Column('id', sa.INTEGER(), nullable=True), - sa.Column('hash', sa.INTEGER(), nullable=True), + sa.Column('session_id', sa.String, nullable=False), + sa.Column('md5_digest', sa.LargeBinary, nullable=False), + sa.Column('file_size', sa.Integer, nullable=False), + sa.Column('type', sa.Integer, nullable=False), + sa.Column('id', sa.BigInteger, nullable=True), + sa.Column('hash', sa.BigInteger, nullable=True), sa.PrimaryKeyConstraint('session_id', 'md5_digest', 'file_size', 'type')) Entity = op.create_table('telethon_entities', - sa.Column('session_id', sa.VARCHAR(), nullable=False), - sa.Column('id', sa.INTEGER(), nullable=False), - sa.Column('hash', sa.INTEGER(), nullable=False), - sa.Column('username', sa.VARCHAR(), nullable=True), - sa.Column('phone', sa.INTEGER(), nullable=True), - sa.Column('name', sa.VARCHAR(), nullable=True), + sa.Column('session_id', sa.String, nullable=False), + sa.Column('id', sa.Integer, nullable=False), + sa.Column('hash', sa.Integer, nullable=False), + sa.Column('username', sa.String, nullable=True), + sa.Column('phone', sa.Integer, nullable=True), + sa.Column('name', sa.String, nullable=True), sa.PrimaryKeyConstraint('session_id', 'id')) Version = op.create_table('telethon_version', - sa.Column('version', sa.INTEGER(), nullable=False), + sa.Column('version', sa.Integer, nullable=False), sa.PrimaryKeyConstraint('version')) conn = op.get_bind() sessions = [os.path.basename(f) for f in os.listdir(".") if f.endswith(".session")] diff --git a/alembic/versions/7d47d84380b6_add_timestamp_to_telegramfile.py b/alembic/versions/7d47d84380b6_add_timestamp_to_telegramfile.py index 10d59c87..9c7176ac 100644 --- a/alembic/versions/7d47d84380b6_add_timestamp_to_telegramfile.py +++ b/alembic/versions/7d47d84380b6_add_timestamp_to_telegramfile.py @@ -18,7 +18,7 @@ depends_on = None def upgrade(): op.add_column('telegram_file', sa.Column('timestamp', sa.BigInteger(), nullable=False, default=0, - server_default="true")) + server_default="0")) def downgrade(): diff --git a/alembic/versions/97d2a942bcf8_initial_revision.py b/alembic/versions/97d2a942bcf8_initial_revision.py index 00d3354d..deb7cbd2 100644 --- a/alembic/versions/97d2a942bcf8_initial_revision.py +++ b/alembic/versions/97d2a942bcf8_initial_revision.py @@ -29,7 +29,7 @@ def upgrade(): sa.UniqueConstraint('mxid')) op.create_table('user', sa.Column('mxid', sa.String), - sa.Column('tgid', sa.Integer, nullable=True), + sa.Column('tgid', sa.Integer, nullable=True, unique=True), sa.Column('tg_username', sa.String, nullable=True), sa.Column('saved_contacts', sa.Integer, nullable=False, default=0), sa.PrimaryKeyConstraint('mxid')) diff --git a/mautrix_telegram/db.py b/mautrix_telegram/db.py index f0a04b9a..df8044a4 100644 --- a/mautrix_telegram/db.py +++ b/mautrix_telegram/db.py @@ -70,7 +70,7 @@ class User(Base): __tablename__ = "user" mxid = Column(String, primary_key=True) - tgid = Column(Integer, nullable=True) + tgid = Column(Integer, nullable=True, unique=True) tg_username = Column(String, nullable=True) saved_contacts = Column(Integer, default=0) contacts = relationship("Contact", uselist=True,