From f3bdb596bd2334cc22fbdeb3dc510763ab481785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Tue, 8 Aug 2017 18:34:36 +0200 Subject: [PATCH] Refactor remove_roster() - Execute as script to save roundtrips --- gajim/common/logger.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/gajim/common/logger.py b/gajim/common/logger.py index 56671329d..f3b0721d0 100644 --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -1033,14 +1033,19 @@ class Logger: def remove_roster(self, account_jid): """ - Remove all entry from account_jid roster - """ - account_jid_id = self.get_jid_id(account_jid) + Remove the roster of an account - self.cur.execute('DELETE FROM roster_entry WHERE account_jid_id=?', - (account_jid_id,)) - self.cur.execute('DELETE FROM roster_group WHERE account_jid_id=?', - (account_jid_id,)) + :param account_jid: The jid of the account + """ + + jid_id = self.get_jid_id(account_jid) + + sql = ''' + DELETE FROM roster_entry WHERE account_jid_id = {jid_id}; + DELETE FROM roster_group WHERE account_jid_id = {jid_id}; + '''.format(jid_id=jid_id) + + self.con.executescript(sql) self._timeout_commit() def search_for_duplicate(self, jid, timestamp, msg):