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

IdoQuery: Fix that PostgreSQL queries do not apply LOWER() on order cols 

refs #10364
refs #9955
This commit is contained in:
Johannes Meyer 2015-11-11 15:25:40 +01:00
parent 22f966db43
commit 39f4d869b7
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,26 +421,32 @@ abstract class IdoQuery extends DbQuery
}
/**
* Order the result by the given column
* Order the result by the given alias
*
* @param string $columnOrAlias The column or column alias to order by
* @param int $dir The sort direction or null to use default direction
* @param string $alias The column alias to order by
* @param int $dir The sort direction or null to use the default direction
*
* @return $this Fluent interface
* @return $this
*/
public function order($columnOrAlias, $dir = null)
public function order($alias, $dir = null)
{
$this->requireColumn($columnOrAlias);
$this->orderColumns[$columnOrAlias] = $columnOrAlias;
if ($this->isCustomvar($columnOrAlias)) {
$columnOrAlias = $this->getCustomvarColumnName($columnOrAlias);
} elseif ($this->hasAliasName($columnOrAlias)) {
$columnOrAlias = $this->aliasToColumnName($columnOrAlias);
$this->requireColumn($alias);
if ($this->isCustomvar($alias)) {
$column = $this->getCustomvarColumnName($alias);
} elseif ($this->hasAliasName($alias)) {
$column = $this->aliasToColumnName($alias);
$table = $this->aliasToTableName($alias);
if (isset($this->caseInsensitiveColumns[$table][$alias])) {
$column = 'LOWER(' . $column . ')';
}
} else {
Logger::info('Can\'t order by column ' . $columnOrAlias);
Logger::info('Can\'t order by column ' . $alias);
return $this;
}
return parent::order($columnOrAlias, $dir);
$this->orderColumns[$alias] = $alias;
return parent::order($column, $dir);
}
/**