[Git][gajim/gajim][master] 2 commits: imprv: Migration: Make archive migation more resilient

Philipp Hörist pushed to branch master at gajim / gajim

Commits: f08e1696 by Philipp Hörist at 2022-09-04T23:26:12+02:00 imprv: Migration: Make archive migation more resilient

- - - - - b380d4c5 by Philipp Hörist at 2022-09-04T23:49:57+02:00 refactor: Remove unused code

- - - - -

2 changed files:

- gajim/common/storage/archive.py - gajim/gtk/control.py

Changes:

===================================== gajim/common/storage/archive.py ===================================== @@ -222,7 +222,7 @@ def _migrate(self) -> None: )''',

'''CREATE INDEX IF NOT EXISTS idx_logs_stanza_id - ON logs(stanza_id)''', + ON logs(stanza_id)''', 'PRAGMA user_version=1' ]

@@ -252,7 +252,8 @@ def _migrate(self) -> None:

if user_version < 5: statements = [ - 'CREATE INDEX idx_logs_message_id ON logs (message_id)', + '''CREATE INDEX IF NOT EXISTS idx_logs_message_id + ON logs (message_id)''', 'PRAGMA user_version=5' ] self._execute_multiple(statements)

===================================== gajim/gtk/control.py ===================================== @@ -1169,6 +1169,3 @@ def _on_room_subject(self, if (app.settings.get('show_subject_on_join') or not contact.is_joining): self.conversation_view.add_muc_subject(subject) - - def rejoin(self) -> None: - self.client.get_module('MUC').join(self.contact.jid)

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/91cb768eb2173ce27492571fdf721255...