tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3092 from Icinga/fix/postgresql-groupby 

pogsql: Group by custom variables when querying them
This commit is contained in:
lippserd 2017-11-16 20:23:06 +01:00 committed by GitHub
parent 6f9e18cd34 d11519ac49
commit 5c1d67a1ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
View File

@ -1163,6 +1163,14 @@ abstract class IdoQuery extends DbQuery
foreach (new ColumnFilterIterator($this->columns) as $desiredAlias => $desiredColumn) { foreach (new ColumnFilterIterator($this->columns) as $desiredAlias => $desiredColumn) {
$alias = is_string($desiredAlias) ? $this->customAliasToAlias($desiredAlias) : $desiredColumn; $alias = is_string($desiredAlias) ? $this->customAliasToAlias($desiredAlias) : $desiredColumn;
if ($this->isCustomVar($alias) && $this->getDatasource()->getDbType() === 'pgsql') {
$table = $this->customVars[$alias];
if (! isset($groupedTables[$table])) {
$group[] = $this->getCustomvarColumnName($alias);
$groupedTables[$table] = true;
}
continue;
}
$table = $this->aliasToTableName($alias); $table = $this->aliasToTableName($alias);
if ($table && !isset($groupedTables[$table]) && ( if ($table && !isset($groupedTables[$table]) && (
in_array($table, $joinedOrigins, true) || $this->getDatasource()->getDbType() === 'pgsql') in_array($table, $joinedOrigins, true) || $this->getDatasource()->getDbType() === 'pgsql')
@ -1173,6 +1181,14 @@ abstract class IdoQuery extends DbQuery
if (! empty($group) && $this->getDatasource()->getDbType() === 'pgsql') { if (! empty($group) && $this->getDatasource()->getDbType() === 'pgsql') {
foreach (new ColumnFilterIterator($this->orderColumns) as $alias) { foreach (new ColumnFilterIterator($this->orderColumns) as $alias) {
if ($this->isCustomVar($alias)) {
$table = $this->customVars[$alias];
if (! isset($groupedTables[$table])) {
$group[] = $this->getCustomvarColumnName($alias);
$groupedTables[$table] = true;
}
continue;
}
$table = $this->aliasToTableName($alias); $table = $this->aliasToTableName($alias);
if ($table && !isset($groupedTables[$table]) if ($table && !isset($groupedTables[$table])
&& !in_array($this->getMappedField($alias), $this->columns, true) && !in_array($this->getMappedField($alias), $this->columns, true)