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

Merge pull request #16395 from mauriciofauth/tracking-page-error

Browse Source 
Fix Type Error when visiting the Table Tracking page
This commit is contained in:
Maurício Meneghini Fauth 2020-10-09 15:30:00 -03:00 committed by GitHub
commit 36885e475b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libraries/classes/Tracking.php
View File

@ -93,27 +93,23 @@ class Tracking
/**
* Function to get the list versions of the table
*
* @return object|false
*/
public function getListOfVersionsOfTable(): array
public function getListOfVersionsOfTable()
{
$relation = $this->relation;
$cfgRelation = $relation->getRelationsParam();
$sql_query = ' SELECT * FROM ' .
Util::backquote($cfgRelation['db']) . '.' .
Util::backquote($cfgRelation['tracking']) .
" WHERE db_name = '" . $GLOBALS['dbi']->escapeString($GLOBALS['db']) .
"' " .
" AND table_name = '" .
$GLOBALS['dbi']->escapeString($GLOBALS['table']) . "' " .
' ORDER BY version DESC ';
global $dbi, $db, $table;
$result = $relation->queryAsControlUser($sql_query);
$cfgRelation = $this->relation->getRelationsParam();
$query = sprintf(
'SELECT * FROM %s.%s WHERE db_name = \'%s\' AND table_name = \'%s\' ORDER BY version DESC',
Util::backquote($cfgRelation['db']),
Util::backquote($cfgRelation['tracking']),
$dbi->escapeString($db),
$dbi->escapeString($table)
);
if (! is_array($result)) {
return [];
}
return $result;
return $dbi->query($query, DatabaseInterface::CONNECT_CONTROL, 0, false);
}
/**
@ -144,7 +140,7 @@ class Tracking
$selectableTablesNumRows = $GLOBALS['dbi']->numRows($selectableTablesSqlResult);
$versionSqlResult = $this->getListOfVersionsOfTable();
if ($lastVersion === null) {
if ($lastVersion === null && $versionSqlResult !== false) {
$lastVersion = $this->getTableLastVersionNumber($versionSqlResult);
}
$GLOBALS['dbi']->dataSeek($versionSqlResult, 0);
@ -175,7 +171,7 @@ class Tracking
/**
* Function to get the last version number of a table
*
* @param array $sql_result sql result
* @param object $sql_result sql result
*
* @return int
*/

2
phpstan-baseline.neon
View File

@ -2416,7 +2416,7 @@ parameters:
path: test/classes/TrackingTest.php
-
message: "#^Parameter \\#1 \\$sql_result of method PhpMyAdmin\\\\Tracking\\:\\:getTableLastVersionNumber\\(\\) expects array, string given\\.$#"
message: "#^Parameter \\#1 \\$sql_result of method PhpMyAdmin\\\\Tracking\\:\\:getTableLastVersionNumber\\(\\) expects object, string given\\.$#"
count: 1
path: test/classes/TrackingTest.php

2
test/classes/TrackingTest.php
View File

@ -426,7 +426,7 @@ class TrackingTest extends AbstractTestCase
{
$ret = $this->tracking->getListOfVersionsOfTable();
$this->assertIsArray($ret);
$this->assertNotFalse($ret);
}
/**