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

DbRepository: Take virtual columns into consideration when applying aliases

This commit is contained in:
Johannes Meyer 2015-11-02 17:07:02 +01:00
parent 5db8d08729
commit 71c5fd0bf7
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,17 +254,24 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
* Return the given table with its alias being applied
*
* @param array|string $table
* @param string $virtualTable
*
* @return array|string
*/
protected function applyTableAlias($table)
protected function applyTableAlias($table, $virtualTable = null)
{
$tableAliases = $this->getTableAliases();
if (is_array($table) || !isset($tableAliases[($nonPrefixedTable = $this->removeTablePrefix($table))])) {
return $table;
if (! is_array($table)) {
if ($virtualTable !== null && isset($tableAliases[$virtualTable])) {
return array($tableAliases[$virtualTable] => $table);
}
if (isset($tableAliases[($nonPrefixedTable = $this->removeTablePrefix($table))])) {
return array($tableAliases[$nonPrefixedTable] => $table);
}
}
return array($tableAliases[$nonPrefixedTable] => $table);
return $table;
}
/**
@ -555,12 +562,18 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
*/
public function requireTable($table, RepositoryQuery $query = null)
{
$virtualTable = null;
$statementColumns = $this->getStatementColumns();
if (! isset($statementColumns[$table])) {
$table = parent::requireTable($table);
$newTable = parent::requireTable($table);
if ($newTable !== $table) {
$virtualTable = $table;
}
$table = $newTable;
}
return $this->prependTablePrefix($this->applyTableAlias($table));
return $this->prependTablePrefix($this->applyTableAlias($table, $virtualTable));
}
/**