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

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

This commit is contained in:
Johannes Meyer 2015-05-28 14:26:48 +02:00
parent 08f8fe6f49
commit fd931e4232
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Icinga/Repository/RepositoryQuery.php
View File

@ -77,10 +77,8 @@ class RepositoryQuery implements QueryInterface, Iterator
public function from($target, array $columns = null) public function from($target, array $columns = null)
{ {
$target = $this->repository->requireTable($target, $this); $target = $this->repository->requireTable($target, $this);
$this->query = $this->repository $this->query = $this->repository->getDataSource()->select()->from($target);
->getDataSource() $this->query->columns($this->prepareQueryColumns($target, $columns));
->select()
->from($target, $this->prepareQueryColumns($target, $columns));
$this->target = $target; $this->target = $target;
return $this; return $this;
} }