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

DbRepository: Avoid to overwrite foreign keys in $aliasTableMap and $aliasColumnMap

This commit is contained in:
Johannes Meyer 2017-07-06 14:10:15 +02:00
parent 6848ed6c1e
commit b397b01966
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,8 +252,22 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
$prefixedAlias = $table . '_' . $alias;
}
$this->aliasTableMap[$prefixedAlias] = $table;
$this->aliasColumnMap[$prefixedAlias] = $this->aliasColumnMap[$alias];
if (array_key_exists($prefixedAlias, $this->aliasTableMap)) {
if ($this->aliasTableMap[$prefixedAlias] !== null) {
$existingTable = $this->aliasTableMap[$prefixedAlias];
$existingColumn = $this->aliasColumnMap[$prefixedAlias];
$this->aliasTableMap[$existingTable . '.' . $prefixedAlias] = $existingTable;
$this->aliasColumnMap[$existingTable . '.' . $prefixedAlias] = $existingColumn;
$this->aliasTableMap[$prefixedAlias] = null;
$this->aliasColumnMap[$prefixedAlias] = null;
}
$this->aliasTableMap[$table . '.' . $prefixedAlias] = $table;
$this->aliasColumnMap[$table . '.' . $prefixedAlias] = $this->aliasColumnMap[$alias];
} else {
$this->aliasTableMap[$prefixedAlias] = $table;
$this->aliasColumnMap[$prefixedAlias] = $this->aliasColumnMap[$alias];
}
}
}
}