Implemented continuing and aborting of changing

Author: Cabpacob

utils/change_engine/interface.py

@@ -27,14 +27,17 @@ def create(self):
 
     def rename(self, new_name):
         if self.exist:
-            self.__client.execute(f'RENAME TABLE {self.name} TO {new_name}')
+            self.__client.execute(f'RENAME TABLE {self.fullname} TO {new_name}')
 
         self.__name = new_name
 
+    def change_database(self, new_database):
+        self.rename(f'{new_database}.{self.name}')
+
     def drop(self):
-        assert self.exist, f'Table {self.name} does not exist'
+        assert self.exist, f'Table {self.fullname} does not exist'
 
-        self.__client.execute(f'DROP TABLE {self.name}')
+        self.__client.execute(f'DROP TABLE {self.fullname}')
 
 
 class Database:
@@ -68,7 +71,7 @@ def construct_table(table_name):
         tables = self.__client.execute(f'SELECT name FROM system.tables WHERE database == \'{self.name}\'')
         tables = map(lambda row: row[0], tables)
 
-        return {name: construct_table(name) for name in tables}
+        return [construct_table(name) for name in tables]
 
     def get_table(self, table_name):
         assert self.exist, f'Database {self.name} does not exist'
@@ -97,6 +100,10 @@ def create_table(self, table_name):
 
         return table
 
+    def move_tables(self, tables):
+        for table in tables:
+            table.change_database(self.name)
+
     def drop(self):
         assert self.exist, f'Database {self.name} does not exist'
 

utils/change_engine/ordinary_to_atomic.py

@@ -23,17 +23,21 @@ def __get_atomic_name(self, ordinary_name):
         return f'{self.__atomic_prefix}{ordinary_name}'
 
     def __finished_previous_sessions(self, ordinary_database, atomic_database):
-        if atomic_database.exist and not ordinary_database.exist:
-            atomic_database.rename(ordinary_database.name)
+        if atomic_database.exist:
+            answer = self.__user_interactor.ask(
+                f'Changing for database {ordinary_database.name} failed in previous launch.\n'
+                 'Do you want to continue changing? (y/n)\n'
+            )
 
-            self.__user_interactor.notify(f'Changing continued after fail in previous launch and can\'t restore ordinary database, but atomic was restored')
-
-            return False
-        elif atomic_database.exist and ordinary_database.exist:
-            answer = self.__user_interactor.ask(f'Changing failed in previous launch. Do you want to continue changing? (y/n)')
             if answer == 'y':
-                pass #TODO
+                atomic_database.move_tables(ordinary_database.tables)
+                ordinary_database.drop()
+                atomic_database.rename(ordinary_database.name)
             elif answer == 'n':
+                if not ordinary_database.exist:
+                    ordinary_database.create()
+
+                ordinary_database.move_tables(atomic_database.tables)
                 atomic_database.drop()
             else:
                 self.__user_interactor.notify(f'Wrong answer, skipped')
@@ -56,7 +60,8 @@ def convert(self, ordinary_name):
             atomic_database.create(engine = 'Atomic')
             tables = ordinary_database.tables
 
-            for table_name, table in tables.items():
+            for table in tables:
+                table_name = table.name
                 ordinary_table = ordinary_database.get_table(table_name)
                 atomic_table_name = f'{atomic_database.name}.{table_name}'
                 ordinary_table.rename(atomic_table_name)