From dd069288e93083113777b1583be0ba7da7460500 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 4 Nov 2015 15:59:15 +0100
Subject: [PATCH] DbRepository: Do not attempt to join virtual tables multiple
 times

---
 library/Icinga/Repository/DbRepository.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Repository/DbRepository.php b/library/Icinga/Repository/DbRepository.php
index 5401f0d05..9292a208b 100644
--- a/library/Icinga/Repository/DbRepository.php
+++ b/library/Icinga/Repository/DbRepository.php
@@ -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;
         }