From 5584a1ef7b20d468445d4b500acbfe050b5acee9 Mon Sep 17 00:00:00 2001 From: Mzhelskiy Maxim Date: Fri, 14 Oct 2016 22:27:11 +0700 Subject: [PATCH] fix install --- application/install/backend/step.php | 4 +++- application/install/backend/step/updateVersion.php | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/application/install/backend/step.php b/application/install/backend/step.php index cbec4964..56bf3c8d 100644 --- a/application/install/backend/step.php +++ b/application/install/backend/step.php @@ -226,7 +226,9 @@ abstract class InstallStep $bResult = mysqli_query($oDb, $sQuery); if (!$bResult) { $sError = mysqli_error($oDb); - if (isset($aParams['skip_fk_errors']) and $aParams['skip_fk_errors'] and stripos($sError, '_fk') !== false and stripos($sError, 'DROP') !== false) { + if (isset($aParams['skip_fk_errors']) and $aParams['skip_fk_errors'] and + (mysqli_errno($oDb) == 152 or (stripos($sError, '_fk') !== false and stripos($sError, 'DROP') !== false)) + ) { // пропускаем ошибки связанные с внешними ключами } else { $aErrors[] = mysqli_error($oDb); diff --git a/application/install/backend/step/updateVersion.php b/application/install/backend/step/updateVersion.php index 28cea271..75988199 100644 --- a/application/install/backend/step/updateVersion.php +++ b/application/install/backend/step/updateVersion.php @@ -74,9 +74,10 @@ class InstallStepUpdateVersion extends InstallStep */ $sFile = 'sql' . DIRECTORY_SEPARATOR . 'patch_1.0.3_to_2.0.0.sql'; list($bResult, $aErrors) = array_values($this->importDumpDB($oDb, InstallCore::getDataFilePath($sFile), array( - 'engine' => InstallConfig::get('db.tables.engine'), - 'prefix' => InstallConfig::get('db.table.prefix'), - 'check_table' => 'cron_task' + 'engine' => InstallConfig::get('db.tables.engine'), + 'prefix' => InstallConfig::get('db.table.prefix'), + 'check_table' => 'cron_task', + 'skip_fk_errors' => true ))); if ($bResult) { /**