From 518cc0e2764738518b9fac04b19eb1c441c30f45 Mon Sep 17 00:00:00 2001 From: gongzt Date: Wed, 2 Sep 2020 14:25:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=ADlifecycle=E5=8F=82=E6=95=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/initsystem/data_import.py | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/packageship/packageship/application/initsystem/data_import.py b/packageship/packageship/application/initsystem/data_import.py index cda86a5c..1fda79f0 100644 --- a/packageship/packageship/application/initsystem/data_import.py +++ b/packageship/packageship/application/initsystem/data_import.py @@ -200,12 +200,8 @@ class InitDataBase(): raise FileNotFoundError("sqlite file {src} or {bin} does not exist, please \ check and try again".format(src=src_db_file, bin=bin_db_file)) # 3. Obtain temporary source package files and binary package files - _lifecycle_status_val = database_config.get('lifecycle') - if self.__save_data(src_db_file, - bin_db_file, - self.database_name, - _db_name, - _lifecycle_status_val): + if self.__save_data(database_config, + self.database_name): # Update the configuration file of the database database_content = { 'database_name': _db_name, @@ -266,7 +262,7 @@ class InitDataBase(): LOGGER.logger.error(sql_error) return None - def __save_data(self, src_db_file, bin_db_file, db_name, table_name, lifecycle_status_val): + def __save_data(self, database_config, db_name): """ integration of multiple data files @@ -278,6 +274,10 @@ class InitDataBase(): Raises: """ + src_db_file = database_config.get('src_db_file') + bin_db_file = database_config.get('bin_db_file') + table_name = database_config.get('dbname') + lifecycle_status_val = database_config.get('lifecycle') try: with DBHelper(db_name=src_db_file, db_type='sqlite:///', complete_route_db=True) \ as database: @@ -324,15 +324,6 @@ class InitDataBase(): if lifecycle_status_val == 'enable': InitDataBase._storage_packages(table_name, packages_datas) - @staticmethod - def __meta_model(table_name): - """ - The mapping relationship of the orm model - """ - model = type("packages", (Packages, DBHelper.BASE), { - '__tablename__': table_name}) - return model - @staticmethod def _storage_packages(table_name, package_data): """ @@ -744,8 +735,7 @@ class SqliteDatabaseOperations(): if not self.storage and os.path.exists(_db_file + '.db'): os.remove(_db_file + '.db') - # create a sqlite database - # if (self.is_datum and not os.path.exists(_db_file + '.db')) or not self.is_datum: + # create a sqlite database with DBHelper(db_name=_db_file) as database: try: if self.tables: -- Gitee