Skip to content

Commit

Permalink
Fix sync rule preview in case of boolean properties (#2905)
Browse files Browse the repository at this point in the history
Sync rules created for import sources, importing objects with boolean
properties, throws `SQLSTATE` error as shown in the screenshot below.

![Sync Preview SQL State
error](https://github.com/user-attachments/assets/7c1f27f1-0c98-4945-8599-1e60ea5c9574)

The reason for this is because the preview creates temporary branched
objects by importing the objects' properties to check for the
modifications. And the boolean properties, were not transformed to `y`
or `n` (which is the supported datatype for boolean (`ENUM('y','n')`) to
store in the database) before the temporary object is created.

fixes ref/IP/53248
  • Loading branch information
lippserd authored Nov 7, 2024
2 parents 340e3d5 + 4099622 commit 2d332a2
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions library/Director/Db/Branch/BranchedObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
namespace Icinga\Module\Director\Db\Branch;

use Icinga\Exception\NotFoundError;
use Icinga\Module\Director\Data\Db\DbDataFormatter;
use Icinga\Module\Director\Data\Db\DbObject;
use Icinga\Module\Director\Data\Db\DbObjectTypeRegistry;
use Icinga\Module\Director\Data\Json;
use Icinga\Module\Director\Db;
use Icinga\Module\Director\Objects\IcingaObject;
use Ramsey\Uuid\UuidInterface;
use stdClass;

Expand Down Expand Up @@ -198,7 +200,17 @@ public function applyActivity(BranchActivity $activity, Db $connection)
}
}

$dummyObject = IcingaObject::createByType(
$this->objectTable,
[],
$connection
);

foreach ($activity->getModifiedProperties()->jsonSerialize() as $key => $value) {
if ($dummyObject->propertyIsBoolean($key)) {
$value = DbDataFormatter::normalizeBoolean($value);
}

$this->changes[$key] = $value;
}

Expand Down

0 comments on commit 2d332a2

Please sign in to comment.