mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

db-verify make sure the correct ENGINE is used when fixing a missing table.

Browse Source
This commit is contained in:
Cameron 2019-02-24 12:17:03 -08:00
parent e52a660f24
commit 08004d56a7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
e107_handlers/db_verify_class.php
View File

@ -757,10 +757,10 @@ class db_verify
* @param string $table eg. submitnews
* @param string $field eg. submitnews_id
* @param string $sqlFileData (after CREATE) eg. dblog_id int(10) unsigned NOT NULL auto_increment, ..... KEY....
* @param int $id
* @param string $engine MyISAM|InnoDB
* @return string SQL query
*/
function getFixQuery($mode,$table,$field,$sqlFileData)
function getFixQuery($mode, $table, $field, $sqlFileData, $engine = 'MyISAM' )
{
if(substr($mode,0,5)== 'index')
@ -787,12 +787,12 @@ class db_verify
break;
case 'drop':
$query = "ALTER TABLE `".MPREFIX.$table."` DROP `$field` ";
$query = "ALTER TABLE `".MPREFIX.$table."` DROP `$field`";
break;
case 'index':
$newval = str_replace("PRIMARY", "PRIMARY KEY", $newval);
$query = "ALTER TABLE `".MPREFIX.$table."` ADD $newval ";
$query = "ALTER TABLE `".MPREFIX.$table."` ADD ".$newval;
break;
case 'indexdrop':
@ -800,7 +800,7 @@ class db_verify
break;
case 'create':
$query = "CREATE TABLE `".MPREFIX.$table."` (".$sqlFileData.") ENGINE=MyISAM;";
$query = "CREATE TABLE `".MPREFIX.$table."` (".$sqlFileData.") ENGINE=".$engine.";";
break;
}
@ -839,7 +839,7 @@ class db_verify
foreach($fixes as $mode)
{
$query = $this->getFixQuery($mode,$table,$field,$this->sqlFileTables[$j]['data'][$id]);
$query = $this->getFixQuery($mode,$table,$field,$this->sqlFileTables[$j]['data'][$id],$this->sqlFileTables[$j]['engine'][$id]);
// $mes->addDebug("Query: ".$query);