GitLab

at 2017-12-17T11:55:38+01:00

Add correct DB migration

Fixes #8806

Update version to 0.98.2

Remove unused DB fields

This field was added but never used

This does not remove the columns from the DB, but doesnt add them
in new migrations.

 import subprocess

-__version__ = "0.98.1"

+__version__ = "0.98.2"

 try:

     node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True,

                     subject TEXT,

                     additional_data TEXT DEFAULT '{}',

                     stanza_id TEXT,

-                    mam_id TEXT,

                     encryption TEXT,

                     encryption_state TEXT,

                     marker INTEGER

             self.update_config_to_016111()

         if old < [0, 16, 11, 2] and new >= [0, 16, 11, 2]:

             self.update_config_to_016112()

+        if old < [0, 98, 2] and new >= [0, 98, 2]:

+            self.update_config_to_0982()

         app.logger.init_vars()

         app.logger.attach_cache_database()

     def update_config_to_016103(self):

         self.call_sql(logger.LOG_DB_PATH,

             '''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;

             '''

         )

         app.config.set('version', '0.16.11.2')

+

+    def update_config_to_0982(self):

+        # This fixes a typo in update_config_to_016112()

+        self.call_sql(logger.LOG_DB_PATH,

+            '''

+            ALTER TABLE logs ADD COLUMN 'account_id' INTEGER;

+            '''

+        )

+        app.config.set('version', '0.98.2')

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

Commits:

3 changed files:

Changes: