diff --git a/module/install/control.php b/module/install/control.php index 7e2584b02a..1a45677c4d 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -99,10 +99,6 @@ class install extends control $this->view->dataRootResult = $this->installZen->checkDataRoot(); $this->view->iniInfo = $this->install->getIniInfo(); - $this->loadModel('bi'); - $checkDuckdb = $this->bi->checkDuckdbInstall(); - $this->view->duckdbResult = $checkDuckdb['ok'] ? 'ok' : 'fail'; - $checkSession = ini_get('session.save_handler') == 'files'; $this->view->sessionResult = 'ok'; $this->view->checkSession = $checkSession; diff --git a/module/install/model.php b/module/install/model.php index 0f225d03d6..753689331b 100644 --- a/module/install/model.php +++ b/module/install/model.php @@ -415,14 +415,6 @@ class installModel extends model die; } - /* Generate parquet file. */ - $result = $this->bi->generateParquetFile(); - if($result !== true) - { - a($result); - die; - } - return true; } diff --git a/module/install/ui/step1.html.php b/module/install/ui/step1.html.php index ee0976dd83..0b6326a533 100644 --- a/module/install/ui/step1.html.php +++ b/module/install/ui/step1.html.php @@ -65,32 +65,6 @@ foreach($dirItems as $dirItem) ); } -/* Check duckdb bin. */ -$checkTrs[] = h::tr -( - h::th($lang->install->duckdb), - h::td($duckdbResult == 'ok' ? $lang->install->loaded : $lang->install->unloaded), - h::td - ( - setClass('duckdbResult text-white' . ($duckdbResult == 'ok' ? ' bg-success' : ' bg-danger')), - $lang->install->{$duckdbResult} - ), - h::td - ( - setClass('text-left'), - $duckdbResult == 'fail' ? modalTrigger - ( - btn - ( - set::size('sm'), - set::type('primary'), - $lang->install->installDuckdb - ), - set::url(createLink('install', 'installDuckdb')), - ) : null - ) -); - div ( setID('main'), @@ -166,7 +140,7 @@ div && $tmpRootResult == 'ok' && $dataRootResult == 'ok' && $sessionResult == 'ok' && $jsonResult == 'ok' && $opensslResult == 'ok' && $mbstringResult == 'ok' && $zlibResult == 'ok' && $curlResult == 'ok' && $filterResult == 'ok' - && $iconvResult == 'ok' && $duckdbResult == 'ok' ? btn + && $iconvResult == 'ok' ? btn ( setClass('px-6 mx-4'), set::url(inlink('step2')), diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 315487a17e..3a3cf6827b 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -163,21 +163,6 @@ class upgrade extends control return $this->display(); } - /* 检查 Duckdb 引擎是否正确安装。*/ - /* Check Duckdb is installed. */ - $checkDuckdb = $this->loadModel('bi')->checkDuckdbInstall(); - if($checkDuckdb['fail']) - { - $this->app->loadLang('install'); - $this->view->result = 'duckdbFail'; - $this->view->duckdb = 'loading'; - $this->view->ext_dm = 'loading'; - $this->view->ext_mysql = 'loading'; - - return $this->display(); - } - - $rawFromVersion = isset($_POST['fromVersion']) ? $this->post->fromVersion : $fromVersion; if(strpos($fromVersion, 'lite') !== false) $rawFromVersion = $this->config->upgrade->liteVersion[$fromVersion]; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index fda9779c70..a051b72177 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -9107,14 +9107,6 @@ class upgradeModel extends model die; } - /* Generate parquet file. */ - $result = $this->bi->generateParquetFile(); - if($result !== true) - { - a($result); - die; - } - return true; } diff --git a/module/upgrade/ui/execute.html.php b/module/upgrade/ui/execute.html.php index d164356322..82dadf7623 100644 --- a/module/upgrade/ui/execute.html.php +++ b/module/upgrade/ui/execute.html.php @@ -11,15 +11,6 @@ declare(strict_types=1); namespace zin; set::zui(true); -jsVar('result', $result); - -if($result == 'duckdbFail') -{ - jsVar('duckdb', $duckdb); - jsVar('ext_dm', $ext_dm); - jsVar('ext_mysql', $ext_mysql); - include $this->app->getBasePath() . "module/install/ui/installduckdb.html.php"; -} div ( @@ -54,11 +45,6 @@ div implode("\n", $errors) ) ) : null, - $result == 'duckdbFail' ? div - ( - setID('duckdbInfo'), - setClass('h-auto') - ) : null, form ( on::click('button[type=submit]', "submitConfirm"), @@ -70,7 +56,6 @@ div ( setClass('mt-4'), $result == 'sqlFail' ? $lang->upgrade->afterExec : null, - $result == 'duckdbFail' ? span(setClass('after-duckdb'), $lang->upgrade->afterDuckdb) : null, $result == 'fail' ? $lang->upgrade->afterDeleted : null, btn (