tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 15:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

DbRepository: Fix that virtual tables are not resolved when issuing statements

Browse Source
This commit is contained in:
Johannes Meyer 2017-06-06 09:33:06 +02:00
parent b8ae738f7f
commit 29f9ff5ce0
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,9 +355,8 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
*/ */
public function insert($table, array $bind) public function insert($table, array $bind)
{ {
$this->requireTable($table);
return $this->ds->insert( return $this->ds->insert(
$this->prependTablePrefix($table), $this->clearTableAlias($this->requireTable($table)),
$this->requireStatementColumns($table, $bind) $this->requireStatementColumns($table, $bind)
); );
} }
@ -373,17 +372,13 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
*/ */
public function update($table, array $bind, Filter $filter = null) public function update($table, array $bind, Filter $filter = null)
{ {
$this->requireTable($table); $realTable = $this->clearTableAlias($this->requireTable($table));
if ($filter) { if ($filter) {
$filter = $this->requireFilter($table, $filter); $filter = $this->requireFilter($table, $filter);
} }
return $this->ds->update( return $this->ds->update($realTable, $this->requireStatementColumns($table, $bind), $filter);
$this->prependTablePrefix($table),
$this->requireStatementColumns($table, $bind),
$filter
);
} }
/** /**
@ -396,13 +391,13 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
*/ */
public function delete($table, Filter $filter = null) public function delete($table, Filter $filter = null)
{ {
$this->requireTable($table); $realTable = $this->clearTableAlias($this->requireTable($table));
if ($filter) { if ($filter) {
$filter = $this->requireFilter($table, $filter); $filter = $this->requireFilter($table, $filter);
} }
return $this->ds->delete($this->prependTablePrefix($table), $filter); return $this->ds->delete($realTable, $filter);
} }
/** /**