gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19101 from kamil-tekiela/Fix-to-stop-processing-queries-on-error

Browse Source 
Fix to stop processing queries on error

Fixes #19091

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2024-04-30 15:10:56 -03:00 committed by GitHub
commit ba5533c2c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/classes/Import.php
View File

@ -252,10 +252,15 @@ class Import
unset($sqlData['valid_full']);
for ($i = 0; $i < $count; $i++) {
$this->executeQuery($queries[$i], $fulls[$i], $sqlData);
if ($GLOBALS['error']) {
break;
}
}
}
$this->executeQuery($import_run_buffer['sql'], $import_run_buffer['full'], $sqlData);
if (! $GLOBALS['error']) {
$this->executeQuery($import_run_buffer['sql'], $import_run_buffer['full'], $sqlData);
}
}
} elseif (! empty($import_run_buffer['full'])) {
if ($go_sql) {

4
libraries/classes/Plugins/Import/ImportSql.php
View File

@ -161,6 +161,10 @@ class ImportSql extends ImportPlugin
$this->import->runQuery($statement, $statement, $sql_data);
}
if ($GLOBALS['error']) {
return;
}
// Finishing.
$this->import->runQuery('', '', $sql_data);
}