tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 16:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

IniRepository: Don't call getDataSource over and over again

Browse Source 
refs #13034
This commit is contained in:
Johannes Meyer 2016-11-04 10:15:56 +01:00
parent 3c5fe76cc0
commit a0db5bea87
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
library/Icinga/Repository/IniRepository.php
View File

@ -255,18 +255,20 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
*/ */
public function insert($target, array $data) public function insert($target, array $data)
{ {
$ds = $this->getDataSource($target);
$newData = $this->requireStatementColumns($target, $data); $newData = $this->requireStatementColumns($target, $data);
$config = $this->onInsert($target, new ConfigObject($newData));
$section = $this->extractSectionName($config, $this->getDataSource($target)->getConfigObject()->getKeyColumn());
if ($this->getDataSource($target)->hasSection($section)) { $config = $this->onInsert($target, new ConfigObject($newData));
$section = $this->extractSectionName($config, $ds->getConfigObject()->getKeyColumn());
if ($ds->hasSection($section)) {
throw new StatementException(t('Cannot insert. Section "%s" does already exist'), $section); throw new StatementException(t('Cannot insert. Section "%s" does already exist'), $section);
} }
$this->getDataSource($target)->setSection($section, $config); $ds->setSection($section, $config);
try { try {
$this->getDataSource($target)->saveIni(); $ds->saveIni();
} catch (Exception $e) { } catch (Exception $e) {
throw new StatementException(t('Failed to insert. An error occurred: %s'), $e->getMessage()); throw new StatementException(t('Failed to insert. An error occurred: %s'), $e->getMessage());
} }
@ -283,8 +285,10 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
*/ */
public function update($target, array $data, Filter $filter = null) public function update($target, array $data, Filter $filter = null)
{ {
$ds = $this->getDataSource($target);
$newData = $this->requireStatementColumns($target, $data); $newData = $this->requireStatementColumns($target, $data);
$keyColumn = $this->getDataSource($target)->getConfigObject()->getKeyColumn();
$keyColumn = $ds->getConfigObject()->getKeyColumn();
if ($filter === null && isset($newData[$keyColumn])) { if ($filter === null && isset($newData[$keyColumn])) {
throw new StatementException( throw new StatementException(
t('Cannot update. Column "%s" holds a section\'s name which must be unique'), t('Cannot update. Column "%s" holds a section\'s name which must be unique'),
@ -292,7 +296,7 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
); );
} }
$query = $this->getDataSource($target)->select(); $query = $ds->select();
if ($filter !== null) { if ($filter !== null) {
$query->addFilter($this->requireFilter($target, $filter)); $query->addFilter($this->requireFilter($target, $filter));
} }
@ -320,16 +324,16 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
unset($newConfig->$keyColumn); unset($newConfig->$keyColumn);
if ($newSection) { if ($newSection) {
if ($this->getDataSource($target)->hasSection($newSection)) { if ($ds->hasSection($newSection)) {
throw new StatementException(t('Cannot update. Section "%s" does already exist'), $newSection); throw new StatementException(t('Cannot update. Section "%s" does already exist'), $newSection);
} }
$this->getDataSource($target)->removeSection($section)->setSection( $ds->removeSection($section)->setSection(
$newSection, $newSection,
$this->onUpdate($target, $config, $newConfig) $this->onUpdate($target, $config, $newConfig)
); );
} else { } else {
$this->getDataSource($target)->setSection( $ds->setSection(
$section, $section,
$this->onUpdate($target, $config, $newConfig) $this->onUpdate($target, $config, $newConfig)
); );
@ -337,7 +341,7 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
} }
try { try {
$this->getDataSource($target)->saveIni(); $ds->saveIni();
} catch (Exception $e) { } catch (Exception $e) {
throw new StatementException(t('Failed to update. An error occurred: %s'), $e->getMessage()); throw new StatementException(t('Failed to update. An error occurred: %s'), $e->getMessage());
} }
@ -353,19 +357,21 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
*/ */
public function delete($target, Filter $filter = null) public function delete($target, Filter $filter = null)
{ {
$query = $this->getDataSource($target)->select(); $ds = $this->getDataSource($target);
$query = $ds->select();
if ($filter !== null) { if ($filter !== null) {
$query->addFilter($this->requireFilter($target, $filter)); $query->addFilter($this->requireFilter($target, $filter));
} }
/** @var ConfigObject $config */ /** @var ConfigObject $config */
foreach ($query as $section => $config) { foreach ($query as $section => $config) {
$this->getDataSource($target)->removeSection($section); $ds->removeSection($section);
$this->onDelete($target, $config); $this->onDelete($target, $config);
} }
try { try {
$this->getDataSource($target)->saveIni(); $ds->saveIni();
} catch (Exception $e) { } catch (Exception $e) {
throw new StatementException(t('Failed to delete. An error occurred: %s'), $e->getMessage()); throw new StatementException(t('Failed to delete. An error occurred: %s'), $e->getMessage());
} }