Fix broken tests

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
phpmyadmin · Feb 15, 2019 · c44d0f8 · c44d0f8
1 parent 3f6e360
commit c44d0f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libraries/classes/Dbi/DbiDummy.php b/libraries/classes/Dbi/DbiDummy.php
@@ -820,7 +820,7 @@ private function init(): void
             ],
             [
                 'query'  => 'SELECT `TABLE_NAME` FROM `INFORMATION_SCHEMA`.`TABLES`'
-                    . ' WHERE `TABLE_SCHEMA`=\'pma_test\' AND `TABLE_TYPE`=\'BASE TABLE\'',
+                    . ' WHERE `TABLE_SCHEMA`=\'pma_test\' AND `TABLE_TYPE` IN (\'BASE TABLE\', \'SYSTEM VERSIONED\')',
                 'result' => [],
             ],
             [
@@ -1280,7 +1280,7 @@ private function init(): void
                 ],
             ],
             [
-                'query'  => "SHOW FULL TABLES FROM `default` WHERE `Table_type`='BASE TABLE'",
+                'query'  => "SHOW FULL TABLES FROM `default` WHERE `Table_type`IN('BASE TABLE', 'SYSTEM VERSIONED')",
                 'result' => [
                     [
                         "test1",
@@ -1294,7 +1294,7 @@ private function init(): void
             ],
             [
                 'query'  => "SHOW FULL TABLES FROM `default` "
-                    . "WHERE `Table_type`!='BASE TABLE'",
+                    . "WHERE `Table_type`NOT IN('BASE TABLE', 'SYSTEM VERSIONED')",
                 'result' => [],
             ],
             [

diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
@@ -210,9 +210,9 @@ private function resultSetContainsUniqueKey($db, $table, array $fields_meta)
                 foreach ($indexColumns as $indexColumnName => $dummy) {
                     if (in_array($indexColumnName, $resultSetColumnNames)) {
                         $numberFound++;
-                    } else if (!in_array($indexColumnName, $columns)) {
+                    } elseif (! in_array($indexColumnName, $columns)) {
                         $numberFound++;
-                    } else if (strpos($columns[$indexColumnName]['Extra'], 'INVISIBLE') !== false) {
+                    } elseif (strpos($columns[$indexColumnName]['Extra'], 'INVISIBLE') !== false) {
                         $numberFound++;
                     }
                 }