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

Fix merge issue

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2023-03-26 13:37:27 -03:00
parent b95aca9090
commit 40cc4a0dee
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
3 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/classes/Util.php
View File

@ -1988,7 +1988,8 @@ class Util
// all tables in db
// - get the total number of tables
// (needed for proper working of the MaxTableList feature)
$totalNumTables = count($GLOBALS['dbi']->getTables($db));
$tables = $GLOBALS['dbi']->getTables($db);
$totalNumTables = count($tables);
if ($isResultLimited) {
// fetch the details for a possible limited subset
$limitOffset = self::getTableListPosition($request, $db);

1
phpunit.xml.dist
View File

@ -13,6 +13,7 @@
displayDetailsOnTestsThatTriggerNotices="true"
displayDetailsOnTestsThatTriggerErrors="true"
displayDetailsOnTestsThatTriggerDeprecations="false"
displayDetailsOnIncompleteTests="true"
requireCoverageMetadata="true"
beStrictAboutOutputDuringTests="true"
colors="true"

53
test/classes/Stubs/DbiDummy.php
View File

@ -2653,51 +2653,16 @@ class DbiDummy implements DbiExtension
],
[
'query' => 'SHOW TABLE STATUS FROM `test_db`',
'columns' => [
'Name',
'Engine',
'Version',
'Row_format',
'Rows',
'Avg_row_length',
'Data_length',
'Max_data_length',
'Index_length',
'Data_free',
'Auto_increment',
'Create_time',
'Update_time',
'Check_time',
'Collation',
'Checksum',
'Create_options',
'Comment',
'Max_index_length',
'Temporary',
],
'columns' => ['Name', 'Engine', 'Version', 'Row_format', 'Rows', 'Avg_row_length', 'Data_length', 'Max_data_length', 'Index_length', 'Data_free', 'Auto_increment', 'Create_time', 'Update_time', 'Check_time', 'Collation', 'Checksum', 'Create_options', 'Comment', 'Max_index_length', 'Temporary'],
'result' => [
[
'test_table',
'InnoDB',
'10',
'Dynamic',
'3',
'5461',
'16384',
'0',
'0',
'0',
'4',
'2011-12-13 14:15:16',
null,
null,
'utf8mb4_general_ci',
null,
'',
'',
'0',
'N',
],
['test_table', 'InnoDB', '10', 'Dynamic', '3', '5461', '16384', '0', '0', '0', '4', '2011-12-13 14:15:16', null, null, 'utf8mb4_general_ci', null, '', '', '0', 'N'],
],
],
[
'query' => 'SHOW TABLE STATUS FROM `test_db` WHERE `Name` IN (\'test_table\')',
'columns' => ['Name', 'Engine', 'Version', 'Row_format', 'Rows', 'Avg_row_length', 'Data_length', 'Max_data_length', 'Index_length', 'Data_free', 'Auto_increment', 'Create_time', 'Update_time', 'Check_time', 'Collation', 'Checksum', 'Create_options', 'Comment', 'Max_index_length', 'Temporary'],
'result' => [
['test_table', 'InnoDB', '10', 'Dynamic', '3', '5461', '16384', '0', '0', '0', '4', '2011-12-13 14:15:16', null, null, 'utf8mb4_general_ci', null, '', '', '0', 'N'],
],
],
[