Philipp Hörist pushed to branch master at gajim / gajim
Commits: c75c45bc by Philipp Hörist at 2017-03-13T19:33:16+01:00 Add new Columns to Logs.db
- - - - - d874676e by Philipp Hörist at 2017-03-13T21:18:28+01:00 Merge branch 'sql' into 'master'
Add new Columns to Logs.db
See merge request !66 - - - - -
3 changed files:
- src/common/check_paths.py - src/common/defs.py - src/common/optparser.py
Changes:
===================================== src/common/check_paths.py ===================================== --- a/src/common/check_paths.py +++ b/src/common/check_paths.py @@ -72,7 +72,12 @@ def create_log_db(): show INTEGER, message TEXT, subject TEXT, - additional_data TEXT DEFAULT '{}' + additional_data TEXT DEFAULT '{}', + stanza_id TEXT, + mam_id TEXT, + encryption TEXT, + encryption_state TEXT, + marker INTEGER );
CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC);
===================================== src/common/defs.py ===================================== --- a/src/common/defs.py +++ b/src/common/defs.py @@ -30,7 +30,7 @@ import os.path docdir = '../' basedir = '../' localedir = '../po' -version = '0.16.10.2' +version = '0.16.10.3'
try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True,
===================================== src/common/optparser.py ===================================== --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -234,6 +234,8 @@ class OptionsParser: self.update_config_to_016101() if old < [0, 16, 10, 2] and new >= [0, 16, 10, 2]: self.update_config_to_016102() + if old < [0, 16, 10, 3] and new >= [0, 16, 10, 3]: + self.update_config_to_016103()
gajim.logger.init_vars() gajim.logger.attach_cache_database() @@ -975,3 +977,25 @@ class OptionsParser: con.close()
gajim.config.set('version', '0.16.10.2') + + def update_config_to_016103(self): + back = os.getcwd() + os.chdir(logger.LOG_DB_FOLDER) + con = sqlite.connect(logger.LOG_DB_FILE) + os.chdir(back) + cur = con.cursor() + try: + cur.executescript( + ''' + ALTER TABLE logs ADD COLUMN 'stanza_id' TEXT; + ALTER TABLE logs ADD COLUMN 'mam_id' TEXT; + ALTER TABLE logs ADD COLUMN 'encryption' TEXT; + ALTER TABLE logs ADD COLUMN 'encryption_state' TEXT; + ALTER TABLE logs ADD COLUMN 'marker' INTEGER; + ''' + ) + con.commit() + except sqlite.OperationalError: + pass + con.close() + gajim.config.set('version', '0.16.10.3')
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/55561b3dd0df0cb8e49aa6be32d7846ba6...