Merge branch 'QA_5_1'

Also fixed tests from previous merge: 2d307ed06285528375be24eb1b6dc43006a5259d

Signed-off-by: William Desportes <williamdes@wdes.fr>

4 files changed, 32 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index f8075095ba..3a4bf18822 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,6 +119,13 @@ phpMyAdmin - ChangeLog
 - issue        Fix the display of Indexes that use Expressions and not column names
 - issue        Allow to create the phpMyAdmin storage database using a different name than "phpmyadmin" using the interface
 - issue #17092 Document that "$cfg['Servers'][$i]['designer_coords']" was removed in version 4.3.0
+- issue #16906 Support special table names for pmadb storage table names
+- issue #16906 Fix a caching effect on the feature list after creating the tables
+- issue #16906 Better report errors when creating the pmadb or it's tables
+- issue #16906 Create the pmadb tables using the names configured and not the default names
+- issue #16906 Create the phpMyAdmin storage database using the configured "['pmadb']" name and not always "phpmyadmin"
+- issue #16906 Prevent incorrect overriding of configured values after a pmadb fix
+- issue #16906 Use the control connection to create the storage database and tables and not the user connection
 
 5.1.1 (2021-06-04)
 - issue #13325 Fixed created procedure shows up in triggers and events and vice-versa
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 66d019b099..c8a536ff29 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -11125,7 +11125,7 @@
       <code>$values</code>
       <code>$values</code>
     </MixedArgumentTypeCoercion>
-    <MixedArrayAccess occurrences="26">
+    <MixedArrayAccess occurrences="25">
       <code>$aliases[$oldDatabase]['tables']</code>
       <code>$cfgRelation['mimework']</code>
       <code>$columnAliases[$column['name']]</code>
@@ -11137,7 +11137,6 @@
       <code>$column['Null']</code>
       <code>$column['Type']</code>
       <code>$column['Type']</code>
-      <code>$column['name']</code>
       <code>$definition['Type']</code>
       <code>$mime['mimetype']</code>
       <code>$oneKey['index_list']</code>
@@ -11153,20 +11152,15 @@
       <code>$trigger['create']</code>
       <code>$trigger['drop']</code>
     </MixedArrayAccess>
-    <MixedArrayAssignment occurrences="1">
-      <code>$field-&gt;key-&gt;columns[$key]['name']</code>
-    </MixedArrayAssignment>
-    <MixedArrayOffset occurrences="8">
+    <MixedArrayOffset occurrences="6">
       <code>$aliases[$db]['tables'][$table]['columns'][$field]</code>
       <code>$aliases[$db]['tables'][$table]['columns'][$relField]</code>
       <code>$aliases[$db]['tables'][$view]['columns'][$colAlias]</code>
-      <code>$aliases[$oldDatabase]['tables'][$oldTable]['columns'][$column['name']]</code>
       <code>$aliases[$oldDatabase]['tables'][$refTable]['columns'][$column]</code>
-      <code>$columnAliases[$column['name']]</code>
       <code>$oneKey['ref_index_list'][$index]</code>
       <code>$values[$val]</code>
     </MixedArrayOffset>
-    <MixedAssignment occurrences="44">
+    <MixedAssignment occurrences="43">
       <code>$GLOBALS['old_tz']</code>
       <code>$colAlias</code>
       <code>$colAlias</code>
@@ -11174,7 +11168,6 @@
       <code>$colAs</code>
       <code>$column</code>
       <code>$column</code>
-      <code>$column</code>
       <code>$columnAliases</code>
       <code>$createQuery</code>
       <code>$definition</code>
@@ -13648,7 +13641,6 @@
       <code>$com_rs</code>
       <code>$com_rs</code>
       <code>$com_rs</code>
-      <code>$createQueries[$table]</code>
       <code>$disp</code>
       <code>$disp</code>
       <code>$disp</code>
@@ -13665,6 +13657,7 @@
       <code>$result</code>
       <code>$row[1]</code>
       <code>$show_create_table</code>
+      <code>$tableNameReplacements[$tableName]</code>
       <code>$tableRes</code>
       <code>$tableRes</code>
       <code>$tablesRows</code>
@@ -13695,7 +13688,8 @@
       <code>$relrow[$foreign_display]</code>
       <code>$relrow[$foreign_field]</code>
     </MixedArrayAccess>
-    <MixedArrayAssignment occurrences="5">
+    <MixedArrayAssignment occurrences="6">
+      <code>$_SESSION['relation'][$GLOBALS['server']]</code>
       <code>$_SESSION['relation'][$GLOBALS['server']]</code>
       <code>$_SESSION['relation'][$GLOBALS['server']]</code>
       <code>$_SESSION['sql_history'][]</code>
@@ -13785,7 +13779,7 @@
       <code>string[]</code>
       <code>string|false</code>
     </MixedInferredReturnType>
-    <MixedOperand occurrences="53">
+    <MixedOperand occurrences="54">
       <code>$max_time</code>
       <code>$messages['disabled']</code>
       <code>$messages['enabled']</code>
@@ -13836,6 +13830,7 @@
       <code>Util::backquote($foreign_field)</code>
       <code>Util::backquote($foreign_table)</code>
       <code>Util::backquote($foreign_table)</code>
+      <code>Util::backquote($tableDbName)</code>
     </MixedOperand>
     <MixedReturnStatement occurrences="6">
       <code>$_SESSION['relation'][$GLOBALS['server']]</code>
@@ -13871,8 +13866,9 @@
     <PossiblyUndefinedArrayOffset occurrences="1">
       <code>$GLOBALS['cfg']['ForeignKeyDropdownOrder'][1]</code>
     </PossiblyUndefinedArrayOffset>
-    <RedundantCast occurrences="1">
+    <RedundantCast occurrences="2">
       <code>(int) $GLOBALS['cfg']['LimitChars']</code>
+      <code>(string) $table[1]</code>
     </RedundantCast>
     <RedundantCastGivenDocblockType occurrences="3">
       <code>(string) $data</code>
@@ -18718,18 +18714,21 @@
       <code>assertFalse</code>
       <code>assertSame</code>
     </DocblockTypeContradiction>
-    <MixedArrayAccess occurrences="2">
+    <MixedArrayAccess occurrences="3">
+      <code>$_SESSION['relation'][$GLOBALS['server']]['version']</code>
       <code>$_SESSION['relation'][$GLOBALS['server']]['version']</code>
       <code>$_SESSION['relation'][$GLOBALS['server']]['version']</code>
     </MixedArrayAccess>
     <MixedArrayAssignment occurrences="1">
       <code>$_SESSION['relation'][$GLOBALS['server']]</code>
     </MixedArrayAssignment>
-    <RedundantCondition occurrences="2">
+    <RedundantCondition occurrences="3">
+      <code>assertSame</code>
       <code>assertSame</code>
       <code>assertSame</code>
     </RedundantCondition>
-    <RedundantConditionGivenDocblockType occurrences="1">
+    <RedundantConditionGivenDocblockType occurrences="2">
+      <code>assertSame</code>
       <code>assertSame</code>
     </RedundantConditionGivenDocblockType>
     <TypeDoesNotContainType occurrences="3">
diff --git a/test/classes/DatabaseInterfaceTest.php b/test/classes/DatabaseInterfaceTest.php
index f08704d76d..ba5976d456 100644
--- a/test/classes/DatabaseInterfaceTest.php
+++ b/test/classes/DatabaseInterfaceTest.php
@@ -836,6 +836,8 @@ class DatabaseInterfaceTest extends AbstractTestCase
             ['NULL']
         );
 
+        $this->dummyDbi->addSelectDb('PMA-storage');
+
         $this->dbi->initRelationParamsCache();
 
         $this->assertArrayHasKey(
@@ -846,6 +848,7 @@ class DatabaseInterfaceTest extends AbstractTestCase
         );
 
         $this->assertAllQueriesConsumed();
+        $this->assertAllSelectsConsumed();
 
         $this->dummyDbi->addResult(
             'SHOW TABLES FROM `PMA-storage`',
diff --git a/test/classes/RelationTest.php b/test/classes/RelationTest.php
index e56ca5d6ff..da58abfba4 100644
--- a/test/classes/RelationTest.php
+++ b/test/classes/RelationTest.php
@@ -1001,13 +1001,15 @@ class RelationTest extends AbstractTestCase
         $this->assertArrayHasKey('relation', $_SESSION, 'The cache is expected to be filled');
         $this->assertSame([], $_SESSION['relation']);
 
+        $this->dummyDbi->addSelectDb('db_pma');
+        $this->dummyDbi->addSelectDb('db_pma');
         $this->relation->fixPmaTables('db_pma', true);
         $this->assertArrayNotHasKey('message', $GLOBALS);
         $this->assertArrayHasKey('relation', $_SESSION, 'The cache is expected to be filled');
         $this->assertSame('db_pma', $GLOBALS['cfg']['Server']['pmadb']);
 
         $this->assertSame([
-            'PMA_VERSION' => $_SESSION['relation'][$GLOBALS['server']]['PMA_VERSION'],
+            'version' => $_SESSION['relation'][$GLOBALS['server']]['version'],
             'relwork' => false,
             'displaywork' => false,
             'bookmarkwork' => false,
@@ -1033,6 +1035,7 @@ class RelationTest extends AbstractTestCase
         ], $_SESSION['relation'][$GLOBALS['server']]);
 
         $this->assertAllQueriesConsumed();
+        $this->assertAllSelectsConsumed();
     }
 
     public function testFixPmaTablesNormalFixTablesFails(): void
@@ -1126,6 +1129,7 @@ class RelationTest extends AbstractTestCase
             'SHOW TABLES FROM `phpmyadmin`',
             []
         );
+        $this->dummyDbi->addSelectDb('phpmyadmin');
 
         $this->assertArrayNotHasKey('errno', $GLOBALS);
 
@@ -1137,6 +1141,7 @@ class RelationTest extends AbstractTestCase
 
         $this->assertAllQueriesConsumed();
         $this->assertAllErrorCodesConsumed();
+        $this->assertAllSelectsConsumed();
     }
 
     public function testCreatePmaDatabaseFailsError1044(): void