upstream/icingadb-web
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb-web.git synced 2026-05-28 04:36:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use Query::columns() instead of ::setColumns()

Browse source 
Query::columns() is no longer additive and ::setColumns() will therefore
be removed.
This commit is contained in:
Eric Lippmann 2022-05-31 14:17:01 +02:00 committed by Johannes Meyer
parent 4cbdf1c3d0
commit ebc6735270
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/Icingadb/Common/Auth.php
View file

@ -243,7 +243,7 @@ trait Auth
...$values
);
$query->setColumns($columns);
$query->columns($columns);
}
}

7
library/Icingadb/Data/PivotTable.php
View file

@ -104,8 +104,7 @@ class PivotTable
$this->order[$sort[0]] = $sort[1];
}
// ipl/sql branch put-reset-methods-into-the trait is required for resetOrderBy().
$this->baseQuery = $query->setColumns($gridcols)->resetOrderBy();
$this->baseQuery = $query->columns($gridcols)->resetOrderBy();
$this->xAxisColumn = $xAxisColumn;
$this->yAxisColumn = $yAxisColumn;
$this->gridcols = $gridcols;
@ -254,7 +253,7 @@ class PivotTable
$columns[] = $this->gridcols[$xAxisHeader];
}
$this->xAxisQuery->setColumns($columns);
$this->xAxisQuery->columns($columns);
if ($this->xAxisFilter !== null) {
$this->xAxisQuery->filter($this->xAxisFilter);
@ -303,7 +302,7 @@ class PivotTable
$columns[] = $this->gridcols[$yAxisHeader];
}
$this->yAxisQuery->setColumns($columns);
$this->yAxisQuery->columns($columns);
if ($this->yAxisFilter !== null) {
$this->yAxisQuery->filter($this->yAxisFilter);