Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for change table engine.

Browse Source
This commit is contained in:
wangyidong
2022-08-15 13:04:24 +08:00
parent b6dcbaa519
commit 811c1d2ad6
6 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/control.php
+29 -23
View File
@@ -393,22 +393,36 @@ class admin extends control
* @access public
* @return void
*/
public function ajaxChangeTableEngine($tableName)
public function ajaxChangeTableEngine()
{
$response = array();
$response['result'] = 'success';
$response['message'] = '';
$response['result'] = 'success';
$response['message'] = '';
$response['thisTable'] = '';
$response['nextTable'] = '';
$tableEngines = $this->loadModel('misc')->getTableEngines();
if(!isset($tableEngines[$tableName]))
$thisTable = '';
$nextTable = '';
foreach($tableEngines as $table => $engine)
{
$response['result'] = 'fail';
return print(json_encode($response));
if($engine == 'InnoDB') continue;
if(stripos($table, 'searchindex') !== false)
{
$mysqlVersion = $this->loadModel('install')->getMysqlVersion();
if($mysqlVersion < 5.6) continue;
}
if($thisTable and empty($nextTable)) $nextTable = $table;
if(empty($thisTable)) $thisTable = $table;
if($thisTable and $nextTable) break;
}
if($tableEngines[$tableName] == 'InnoDB')
if(empty($thisTable))
{
$response['message'] = sprintf($this->lang->admin->changeSuccess, $tableName);
$response['result'] = 'finished';
return print(json_encode($response));
}
@@ -419,36 +433,28 @@ class admin extends control
foreach($dbProcesses as $dbProcess)
{
if($dbProcess->db != $this->config->db->name) continue;
if(strpos($dbProcess->Info, " {$tableName} ") !== false)
if(strpos($dbProcess->Info, " {$thisTable} ") !== false)
{
$response['message'] = sprintf($this->lang->upgrade->changingTable, $tableName);
$response['message'] = sprintf($this->lang->upgrade->changingTable, $thisTable);
return print(json_encode($response));
}
}
}
catch(PDOException $e){}
if(stripos($tableName, 'searchindex') !== false)
{
$mysqlVersion = $this->loadModel('install')->getMysqlVersion();
if($mysqlVersion < 5.6)
{
$response['result'] = 'fail';
$response['message'] = $this->lang->admin->errorInnodb;
return print(json_encode($response));
}
}
$response['thisTable'] = $thisTable;
$response['nextTable'] = $nextTable;
try
{
$sql = "ALTER TABLE `$tableName` ENGINE='InnoDB'";
$sql = "ALTER TABLE `$thisTable` ENGINE='InnoDB'";
$this->dao->exec($sql);
$response['message'] = sprintf($this->lang->admin->changeSuccess, $tableName);
$response['message'] = sprintf($this->lang->admin->changeSuccess, $thisTable);
}
catch(PDOException $e)
{
$response['result'] = 'fail';
$response['message'] = sprintf($this->lang->admin->changeFail, $tableName, htmlspecialchars($e->getMessage()));
$response['message'] = sprintf($this->lang->admin->changeFail, $thisTable, htmlspecialchars($e->getMessage()));
}
return print(json_encode($response));