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

DbObject: some cleanup

This commit is contained in:
Thomas Gelf 2021-08-16 06:02:36 +02:00
parent a0253250c1
commit 62a31c7858
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/Director/Data/Db/DbObject.php
View File

@ -781,7 +781,7 @@ abstract class DbObject
* Store object to database
*
* @param DbConnection $db
* @return bool Whether storing succeeded
* @return bool Whether storing succeeded. Always true, throws otherwise
* @throws DuplicateKeyException
*/
public function store(DbConnection $db = null)
@ -809,7 +809,6 @@ abstract class DbObject
try {
if ($this->hasBeenLoadedFromDb()) {
if ($this->updateDb() !== false) {
$result = true;
$this->onUpdate();
} else {
throw new RuntimeException(sprintf(
@ -845,7 +844,6 @@ abstract class DbObject
}
// $this->log(sprintf('New %s "%s" has been stored', $table, $id));
$this->onInsert();
$result = true;
} else {
throw new RuntimeException(sprintf(
'FAILED to store new %s "%s"',
@ -864,13 +862,14 @@ abstract class DbObject
));
}
$this->modifiedProperties = array();
// Hint: order is differs from setBeingLoadedFromDb() as of the onStore hook
$this->modifiedProperties = [];
$this->hasBeenModified = false;
$this->loadedProperties = $this->properties;
$this->onStore();
$this->loadedFromDb = true;
return $result;
return true;
}
/**