Skip to content

Commit 3a6be34

Browse files
committed
class_sqlThread refactoring
1 parent 3337f40 commit 3a6be34

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/class_sqlThread.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,6 @@ def upgrade_to_latest(self):
106106
Initialize upgrade level
107107
"""
108108

109-
while self.sql_schema_version < self.max_level:
110-
self._upgrade_one_level_sql_statement(self.sql_schema_version)
111-
112-
def upgrade_schema_if_old_version(self):
113-
""" check settings table exists """
114-
115109
query = "SELECT name FROM sqlite_master WHERE type='table' AND name='settings'"
116110
parameters = ()
117111
self.cur.execute(query, parameters)
@@ -128,9 +122,15 @@ def upgrade_schema_if_old_version(self):
128122

129123
# initiate sql file
130124
self.initialize_sql("upg_sc_if_old_ver_1")
125+
self.conn.commit()
131126
# After code refactoring, the possible status values for sent messages
132127
# have changed.
133128
self.initialize_sql("upg_sc_if_old_ver_2")
129+
self.conn.commit()
130+
131+
while self.sql_schema_version < self.max_level:
132+
self._upgrade_one_level_sql_statement(self.sql_schema_version)
133+
self.conn.commit()
134134

135135
def check_columns_can_store_binary_null(self):
136136
"""
@@ -403,8 +403,6 @@ def run(self): # pylint: disable=R0204, E501
403403

404404
helper_startup.updateConfig()
405405

406-
self.db.upgrade_schema_if_old_version()
407-
408406
self.db.upgrade_to_latest()
409407

410408
self.db.check_columns_can_store_binary_null()

0 commit comments

Comments
 (0)