RepositoryQuery: getQuery() might be called during prepareQueryColumns()

Icinga · May 28, 2015 · fd931e4 · fd931e4
1 parent 08f8fe6
commit fd931e4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/library/Icinga/Repository/RepositoryQuery.php b/library/Icinga/Repository/RepositoryQuery.php
@@ -77,10 +77,8 @@ public function getQuery()
     public function from($target, array $columns = null)
     {
         $target = $this->repository->requireTable($target, $this);
-        $this->query = $this->repository
-            ->getDataSource()
-            ->select()
-            ->from($target, $this->prepareQueryColumns($target, $columns));
+        $this->query = $this->repository->getDataSource()->select()->from($target);
+        $this->query->columns($this->prepareQueryColumns($target, $columns));
         $this->target = $target;
         return $this;
     }