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

DbRepository: Do not attempt to join virtual tables multiple times

This commit is contained in:
Johannes Meyer 2015-11-04 15:59:15 +01:00
parent 327cf37326
commit dd069288e9
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/Icinga/Repository/DbRepository.php
View File

@ -576,6 +576,21 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
return $this->prependTablePrefix($this->applyTableAlias($table, $virtualTable));
}
/**
* Return the alias for the given table or null if none has been defined
*
* @param string $table
*
* @return string|null
*/
public function resolveTableAlias($table)
{
$tableAliases = $this->getTableAliases();
if (isset($tableAliases[$table])) {
return $tableAliases[$table];
}
}
/**
* Recurse the given filter, require each column for the given table and convert all values
*
@ -828,8 +843,10 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
$column = $name;
}
$prefixedTableName = $this->prependTablePrefix($tableName);
if ($query->getQuery()->hasJoinedTable($prefixedTableName)) {
if (($joinIdentifier = $this->resolveTableAlias($tableName)) === null) {
$joinIdentifier = $this->prependTablePrefix($tableName);
}
if ($query->getQuery()->hasJoinedTable($joinIdentifier)) {
return $column;
}