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

Remove modifiedSql property

Browse Source 
Signed-off-by: Maximilian Krög <maxi_kroeg@web.de>
This commit is contained in:
Maximilian Krög 2023-03-05 01:39:29 +01:00
parent 6b9f0d8441
commit 2181bfa8db
No known key found for this signature in database
GPG Key ID: 3C00897BB53AAB9C
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/classes/Gis/GisVisualization.php
View File

@ -37,8 +37,6 @@ class GisVisualization
/** @var array Raw data for the visualization */
private array $data;
private string $modifiedSql = '';
/** @var array Set of default settings values are here. */
private array $settings = [
// Array of colors to be used for GIS visualizations.
@ -151,12 +149,17 @@ class GisVisualization
$this->rows = $rows;
$this->userSpecifiedSettings = $options;
if (isset($data)) {
$this->data = $data;
} else {
$this->modifiedSql = $this->modifySqlQuery($sql_query);
$this->data = $this->fetchRawData();
}
$this->data = is_string($sql_query)
? $this->modifyQueryAndFetch($sql_query)
: $data;
}
/** @return array raw data */
private function modifyQueryAndFetch(string $sqlQuery): array
{
$modifiedSql = $this->modifySqlQuery($sqlQuery);
return $this->fetchRawData($modifiedSql);
}
/**
@ -228,9 +231,9 @@ class GisVisualization
*
* @return array the raw data.
*/
private function fetchRawData(): array
private function fetchRawData(string $modifiedSql): array
{
$modified_result = $GLOBALS['dbi']->tryQuery($this->modifiedSql);
$modified_result = $GLOBALS['dbi']->tryQuery($modifiedSql);
if ($modified_result === false) {
return [];