tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 23:34:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "monitoring: Fix handling of collated columns w/ PostgreSQL"

Browse Source 
This reverts commit f5ffa8047c97023b2b53b8404957c9ff1306ba85.

refs #10364
refs #9954
refs #9955
This commit is contained in:
Johannes Meyer 2015-11-10 15:58:44 +01:00
parent ad5a43ce7b
commit 52606eb2e7
1 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -485,22 +485,16 @@ abstract class IdoQuery extends DbQuery
if ($filter->getExpression() === '*') { if ($filter->getExpression() === '*') {
return; // Wildcard only filters are ignored so stop early here to avoid joining a table for nothing return; // Wildcard only filters are ignored so stop early here to avoid joining a table for nothing
} }
$alias = $filter->getColumn(); $alias = $filter->getColumn();
$this->requireColumn($alias); $this->requireColumn($alias);
if ($this->isCustomvar($alias)) { if ($this->isCustomvar($alias)) {
$column = $this->getCustomvarColumnName($alias); $column = $this->getCustomvarColumnName($alias);
} else { } else {
$column = $this->aliasToColumnName($alias); $column = $this->aliasToColumnName($alias);
} }
if (isset($this->columnsWithoutCollation[$alias])) {
$expression = $filter->getExpression();
if (is_array($expression)) {
$filter->setExpression(array_map('strtolower', $expression));
} else {
$filter->setExpression(strtolower($expression));
}
}
$filter->setColumn($column); $filter->setColumn($column);
} else { } else {
foreach ($filter->filters() as $filter) { foreach ($filter->filters() as $filter) {
@ -519,11 +513,48 @@ abstract class IdoQuery extends DbQuery
return parent::addFilter($filter); return parent::addFilter($filter);
} }
/**
* Recurse the given filter and ensure that any string conversion is case-insensitive
*
* @param Filter $filter
*/
protected function lowerColumnsWithoutCollation(Filter $filter)
{
if ($filter instanceof FilterExpression) {
if (
in_array($filter->getColumn(), $this->columnsWithoutCollation)
&& strpos($filter->getColumn(), 'LOWER') !== 0
) {
$filter->setColumn('LOWER(' . $filter->getColumn() . ')');
$expression = $filter->getExpression();
if (is_array($expression)) {
$filter->setExpression(array_map('strtolower', $expression));
} else {
$filter->setExpression(strtolower($expression));
}
}
} else {
foreach ($filter->filters() as $chainedFilter) {
$this->lowerColumnsWithoutCollation($chainedFilter);
}
}
}
protected function applyFilterSql($select)
{
if (! empty($this->columnsWithoutCollation)) {
$this->lowerColumnsWithoutCollation($this->filter);
}
parent::applyFilterSql($select);
}
public function where($condition, $value = null) public function where($condition, $value = null)
{ {
if ($value === '*') { if ($value === '*') {
return $this; // Wildcard only filters are ignored so stop early here to avoid joining a table for nothing return $this; // Wildcard only filters are ignored so stop early here to avoid joining a table for nothing
} }
$this->requireColumn($condition); $this->requireColumn($condition);
$col = $this->getMappedField($condition); $col = $this->getMappedField($condition);
if ($col === null) { if ($col === null) {
@ -571,6 +602,7 @@ abstract class IdoQuery extends DbQuery
if (! empty($this->columnsWithoutCollation)) { if (! empty($this->columnsWithoutCollation)) {
return in_array($column, $this->columnsWithoutCollation) || strpos($column, 'LOWER') !== 0; return in_array($column, $this->columnsWithoutCollation) || strpos($column, 'LOWER') !== 0;
} }
return preg_match('/ COLLATE .+$/', $column) === 1; return preg_match('/ COLLATE .+$/', $column) === 1;
} }
@ -601,11 +633,11 @@ abstract class IdoQuery extends DbQuery
{ {
$this->customVarsJoinTemplate = $this->customVarsJoinTemplate =
'%1$s = %2$s.object_id AND LOWER(%2$s.varname) = %3$s'; '%1$s = %2$s.object_id AND LOWER(%2$s.varname) = %3$s';
foreach ($this->columnMap as $table => &$columns) { foreach ($this->columnMap as $table => & $columns) {
foreach ($columns as $alias => &$column) { foreach ($columns as $alias => & $column) {
if (false !== $pos = strpos($column, ' COLLATE')) { $column = preg_replace('/ COLLATE .+$/', '', $column, -1, $count);
$column = 'LOWER(' . substr($column, 0, $pos) . ')'; if ($count > 0) {
$this->columnsWithoutCollation[$alias] = true; $this->columnsWithoutCollation[] = $this->getMappedField($alias);
} }
$column = preg_replace( $column = preg_replace(
'/inet_aton\(([[:word:].]+)\)/i', '/inet_aton\(([[:word:].]+)\)/i',