refactored the class sqlthread with all version tests

Author: cis-muzahid

src/class_sqlThread.py

@@ -44,23 +44,6 @@ def connection_build():
     return conn, cur
 
 
-def versioning(self):
-    """
-        Run mirgations with respect to versions
-    """
-    def wrapper(*args):
-        """
-            Run SQL and mocking DB for versions
-        """
-        self = args[0]
-        func_name = func.__name__
-        version = func_name.rsplit('_', 1)[-1]
-        self.run_migrations(version)
-        return func(*args)  # <-- use (self, ...)
-    func = self
-    return wrapper
-
-
 class UpgradeDB(object):
     """
         Upgrade Db with respect to versions
@@ -110,17 +93,6 @@ def run_migrations(self, file_name):
                     'ERROR trying to create database file (message.dat). Error message: %s\n' % str(err))
                 os._exit(0)
 
-    # @versioning
-    # def upgrade_schema_data_1(self):  # pylint: disable=Method-could-be-a-function, R0201
-    #     """inventory
-    #         For version 1 and 3
-    #         Add a new column to the inventory table to store tags.
-    #     """
-    #
-    #     logger.debug(
-    #         'In messages.dat database, adding tag field to'
-    #         ' the inventory table.')
-
     def upgrade_to_latest(self, cur, conn):
         """
             Initialise upgrade level
@@ -134,6 +106,8 @@ def upgrade_to_latest(self, cur, conn):
 
         # call upgrading level in loop
         for l in range(self.current_level, self.max_level):
+            if int(l) == 3:
+                continue
             self.upgrade_one_level(l)
             self.run_migrations(l)
 
@@ -145,126 +119,6 @@ def upgrade_schema_data_level(self, level):
         parameters = (level + 1,)
         self.cur.execute(item, parameters)
 
-    # @versioning
-    # def upgrade_schema_data_2(self):  # pylint: disable=Method-could-be-a-function, R0201
-    #     """
-    #         For version 2
-    #         Let's get rid of the first20bytesofencryptedmessage field in the inventory table.
-    #     """
-    #
-    #     logger.debug(
-    #         'In messages.dat database, removing an obsolete field from'
-    #         ' the inventory table.')
-    #
-    # def upgrade_schema_data_3(self):  # pylint: disable=Method-could-be-a-function, R0201
-    #     """
-    #         For version 3
-    #         Call method for version 1
-    #     """
-    #
-    #     self.upgrade_schema_data_1()
-    #
-    # @versioning
-    # def upgrade_schema_data_4(self):  # pylint: disable=Method-could-be-a-function, R0201
-    #     """
-    #         For version 4
-    #         Add a new column to the pubkeys table to store the address version.
-    #         We're going to trash all of our pubkeys and let them be redownloaded.
-    #     """
-    #
-    # @versioning
-    # def upgrade_schema_data_5(self):  # pylint: disable=Method-could-be-a-function, R0201
-    #     """
-    #         For version 5
-    #         Add a new table: objectprocessorqueue with which to hold objects
-    #         That have yet to be processed if the user shuts down Bitmessage.
-    #     """
-    #
-    # @versioning
-    # def upgrade_schema_data_6(self):  # pylint: disable=Method-could-be-a-function, R0201
-    #     """
-    #         For version 6
-    #         Changes related to protocol v3
-    #         In table inventory and objectprocessorqueue, objecttype is now
-    #         an integer (it was a human-friendly string previously)
-    #     """
-    #
-    #     logger.debug(
-    #         'In messages.dat database, dropping and recreating'
-    #         ' the inventory table.')
-    #
-    #     logger.debug(
-    #         'Finished dropping and recreating the inventory table.')
-    #
-    # @versioning
-    # def upgrade_schema_data_7(self):  # pylint: disable=Method-could-be-a-function, R0201
-    #     """
-    #         For version 7
-    #         The format of data stored in the pubkeys table has changed. Let's
-    #         clear it, and the pubkeys from inventory, so that they'll
-    #         be re-downloaded.
-    #     """
-    #
-    #     logger.debug(
-    #         'In messages.dat database, clearing pubkeys table'
-    #         ' because the data format has been updated.')
-    #
-    #     logger.debug('Finished clearing currently held pubkeys.')
-    #
-    # @versioning
-    # def upgrade_schema_data_8(self):  # pylint: disable=Method-could-be-a-function, R0201
-    #     """
-    #         For version 8
-    #         Add a new column to the inbox table to store the hash of
-    #         the message signature. We'll use this as temporary message UUID
-    #         in order to detect duplicates.
-    #     """
-    #
-    #     logger.debug(
-    #         'In messages.dat database, adding sighash field to'
-    #         ' the inbox table.')
-    #
-    # @versioning
-    # def upgrade_schema_data_9(self):  # pylint: disable=Method-could-be-a-function, R0201
-    #     """
-    #         For version 9
-    #         We'll also need a `sleeptill` field and a `ttl` field. Also we
-    #         can combine the pubkeyretrynumber and msgretrynumber into one.
-    #     """
-    #
-    #     logger.info(
-    #         'In messages.dat database, making TTL-related changes:'
-    #         ' combining the pubkeyretrynumber and msgretrynumber'
-    #         ' fields into the retrynumber field and adding the'
-    #         ' sleeptill and ttl fields...')
-    #
-    #     logger.info('In messages.dat database, finished making TTL-related changes.')
-    #     logger.debug('In messages.dat database, adding address field to the pubkeys table.')
-    #
-    #     # We're going to have to calculate the address for each row in the pubkeys
-    #     # table. Then we can take out the hash field.
-    #     self.cur.execute('''ALTER TABLE pubkeys ADD address text DEFAULT '' ''')
-    #
-    #     # replica for loop to update hashed address
-    #     self.cur.execute('''UPDATE pubkeys SET address=(enaddr(pubkeys.addressversion, 1, hash)); ''')
-    #
-    #     self.run_migrations("9_1")
-    #
-    #     logger.debug(
-    #         'In messages.dat database, done adding address field to the pubkeys table'
-    #         ' and removing the hash field.')
-    #
-    # @versioning
-    # def upgrade_schema_data_10(self):  # pylint: disable=Method-could-be-a-function, R0201
-    #     """
-    #         For version 10
-    #         Update the address colunm to unique in addressbook table
-    #     """
-    #
-    #     logger.debug(
-    #         'In messages.dat database, updating address column to UNIQUE'
-    #         ' in the addressbook table.')
-
 
 class sqlThread(threading.Thread, UpgradeDB):
     """A thread for all SQL operations"""

src/sql/init_version_9.sql

@@ -30,7 +30,7 @@ INSERT INTO sent_backup SELECT msgid, toaddress, toripe, fromaddress, subject, m
 -- -- Drope table `sent`
 -- --
 
-    DROP TABLE sent;
+DROP TABLE sent;
 
 
 -- --
@@ -71,4 +71,71 @@ INSERT INTO sent SELECT msgid, toaddress, toripe, fromaddress, subject, message,
 -- -- Drop table `sent`
 -- --
 
-    DROP TABLE sent_backup;
+DROP TABLE sent_backup;
+
+-- --
+-- -- Update Table `pubkeys`
+-- -- We're going to have to calculate the address for each row in the pubkeys
+-- -- table. Then we can take out the hash field.
+-- --
+
+ALTER TABLE pubkeys ADD address text DEFAULT '' ;
+
+-- --
+-- -- Update Table `pubkeys`
+-- -- replica for loop to update hashed address
+-- --
+
+UPDATE pubkeys SET address=(enaddr(pubkeys.addressversion, 1, hash));
+
+-- --
+-- --  Table structure for table `pubkeys_backup`
+-- --
+
+CREATE TEMPORARY TABLE `pubkeys_backup` (
+    `address` text DEFAULT NULL,
+    `addressversion` int DEFAULT NULL,
+    `transmitdata` blob DEFAULT NULL,
+    `time` int DEFAULT NULL,
+    `usedpersonally` text DEFAULT NULL,
+    UNIQUE(address) ON CONFLICT REPLACE
+) ;
+
+
+-- --
+-- -- Dumping data for table `pubkeys_backup`
+-- --
+
+INSERT INTO pubkeys_backup SELECT address, addressversion, transmitdata, time, usedpersonally FROM pubkeys;
+
+
+-- --
+-- -- Drope table `pubkeys`
+-- --
+
+DROP TABLE pubkeys;
+
+-- --
+-- --  Table structure for table `pubkeys`
+-- --
+
+CREATE TABLE `pubkeys` (
+    `address` text DEFAULT NULL,
+    `addressversion` int DEFAULT NULL,
+    `transmitdata` blob DEFAULT NULL,
+    `time` int DEFAULT NULL,
+    `usedpersonally` text DEFAULT NULL,
+    UNIQUE(address) ON CONFLICT REPLACE
+) ;
+
+-- --
+-- -- Dumping data for table `pubkeys`
+-- --
+
+INSERT INTO pubkeys SELECT address, addressversion, transmitdata, time, usedpersonally FROM pubkeys_backup;
+
+-- --
+-- -- Dropping table  `pubkeys_backup`
+-- --
+
+DROP TABLE pubkeys_backup;