copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'sql' into 'master'

Browse source 
Add new Columns to Logs.db

See merge request !66
This commit is contained in:
Philipp Hörist 2017-03-13 21:18:28 +01:00
commit d874676e53
3 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/check_paths.py
View file

@ -72,7 +72,12 @@ def create_log_db():
show INTEGER, show INTEGER,
message TEXT, message TEXT,
subject 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); CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC);

2
src/common/defs.py
View file

@ -30,7 +30,7 @@ import os.path
docdir = '../' docdir = '../'
basedir = '../' basedir = '../'
localedir = '../po' localedir = '../po'
version = '0.16.10.2' version = '0.16.10.3'
try: try:
node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True,

24
src/common/optparser.py
View file

@ -234,6 +234,8 @@ class OptionsParser:
self.update_config_to_016101() self.update_config_to_016101()
if old < [0, 16, 10, 2] and new >= [0, 16, 10, 2]: if old < [0, 16, 10, 2] and new >= [0, 16, 10, 2]:
self.update_config_to_016102() 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.init_vars()
gajim.logger.attach_cache_database() gajim.logger.attach_cache_database()
@ -975,3 +977,25 @@ class OptionsParser:
con.close() con.close()
gajim.config.set('version', '0.16.10.2') 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')