DbUserGroupBackend: Do not use the repository abstraction internally

That's overhead which is not necessary. refs #8826
Icinga · May 13, 2015 · 47dfcf5 · 47dfcf5
1 parent 7d98206
commit 47dfcf5
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
@@ -102,19 +102,23 @@ public function update($table, array $bind, Filter $filter = null)
      */
     public function getMemberships(User $user)
     {
+        $groupStmt = $this->ds->select()
+            ->from($this->prependTablePrefix('group'), array('name', 'parent'))
+            ->getSelectQuery()
+            ->query();
         $groups = array();
-        $groupsStmt = $this->select(array('group_name', 'parent_name'))->getQuery()->getSelectQuery()->query();
-        foreach ($groupsStmt as $group) {
-            $groups[$group->group_name] = $group->parent_name;
+        foreach ($groupStmt as $group) {
+            $groups[$group->name] = $group->parent;
         }
 
-        $memberships = array();
-        $membershipsStmt = $this->ds->getDbAdapter() // TODO: Use the join feature, once available
-            ->select()
-            ->from($this->ds->getTablePrefix() . 'group_membership', array('group_name'))
-            ->where('username = ?', $user->getUsername())
+        $membershipStmt = $this->ds->select() // TODO: Join this table
+            ->from($this->prependTablePrefix('group_membership'), array('group_name'))
+            ->where('username', $user->getUsername())
+            ->getSelectQuery()
             ->query();
-        foreach ($membershipsStmt as $membership) {
+        $memberships = array();
+
+        foreach ($membershipStmt as $membership) {
             $memberships[] = $membership->group_name;
             $parent = $groups[$membership->group_name];
             while ($parent !== null) {