From bcf1c5cdab1ff57fe8b0fd4786e56c865287cd52 Mon Sep 17 00:00:00 2001 From: liugang Date: Thu, 7 Mar 2024 15:51:11 +0800 Subject: [PATCH] - upgrade: remove unused code. --- module/upgrade/config/upgradeflow.php | 2 +- module/upgrade/model.php | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/module/upgrade/config/upgradeflow.php b/module/upgrade/config/upgradeflow.php index 2e90d1c6b3..1cdfcbdd83 100644 --- a/module/upgrade/config/upgradeflow.php +++ b/module/upgrade/config/upgradeflow.php @@ -93,7 +93,7 @@ $config->upgrade->execFlow['18_7'] = array('functions' => 'processHistory $config->upgrade->execFlow['18_8'] = array('functions' => 'upgradeTesttaskMembers,deleteGeneralReportBlock,stopOldCron'); $config->upgrade->execFlow['18_9'] = array('functions' => 'addDefaultTraincoursePriv,renameBIModule,migrateXuanClientSettings'); $config->upgrade->execFlow['18_10_1'] = array('functions' => 'migrateAIModelConfig'); -$config->upgrade->execFlow['20_0_alpha1'] = array('functions' => 'revertStoryCustomFields,hideOA,updateMetricDateType,update1810,update18101,migrateAIModelConfig'); +$config->upgrade->execFlow['20_0_alpha1'] = array('functions' => 'revertStoryCustomFields,hideOA,updateMetricDateType,update18101,migrateAIModelConfig'); if(!empty($config->isINT)) { diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 781e711138..0b6ce23568 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -8553,26 +8553,6 @@ class upgradeModel extends model $this->setting->setItem('system.common.closedFeatures', trim($closedFeatures . ',otherOA', ',')); } - /** - * 检查是否添加了18.10版本的需求池字段,如果没有就添加。 - * Check if the demand pool field of version 18.10 is added, if not, add it. - * - * @access public - * @return void - */ - public function update1810(): void - { - $fields = $this->dao->query('DESC ' . TABLE_DEMANDPOOL)->fetchAll(); - foreach($fields as $field) - { - if($field->Field == 'products') return; - } - - /* Execute open edition. */ - $this->saveLogs('Execute 18_10'); - $this->execSQL($this->getUpgradeFile('18.10')); - } - /** * 检查是否添加了18.10.1版本的 AI 表,如果没有就添加。 * Check if the AI table of version 18.10.1 is added, if not, add it.