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

Move getDefaultPmaTableNames out of the loop

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2023-04-02 23:13:30 +01:00
parent 850e867136
commit aef2a96012
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libraries/classes/ConfigStorage/Relation.php
View File

@ -1556,7 +1556,16 @@ class Relation
$tableNameReplacements = $this->getTableReplacementNames($tablesToFeatures);
$createQueries = null;
$createQueries = [];
if ($create) {
$createQueries = $this->getDefaultPmaTableNames($tableNameReplacements);
if (! $this->dbi->selectDb($db, Connection::TYPE_CONTROL)) {
$GLOBALS['message'] = $this->dbi->getError(Connection::TYPE_CONTROL);
return;
}
}
$foundOne = false;
foreach ($tablesToFeatures as $table => $feature) {
// Check if the table already exists
@ -1564,15 +1573,6 @@ class Relation
// if no replacement exists
if (! in_array($tableNameReplacements[$table] ?? $table, $existingTables)) {
if ($create) {
if ($createQueries === null) { // first create
$createQueries = $this->getDefaultPmaTableNames($tableNameReplacements);
if (! $this->dbi->selectDb($db, Connection::TYPE_CONTROL)) {
$GLOBALS['message'] = $this->dbi->getError(Connection::TYPE_CONTROL);
return;
}
}
$this->dbi->tryQuery($createQueries[$table], Connection::TYPE_CONTROL);
$error = $this->dbi->getError(Connection::TYPE_CONTROL);