From 175de1ae84b375aa7445da7023c9b7ead982398e Mon Sep 17 00:00:00 2001 From: raviks789 Date: Thu, 5 Dec 2024 10:11:09 +0100 Subject: [PATCH] Fix pgsql binary resource handling for uuids --- .../Director/DirectorObject/Lookup/ServiceSetServiceInfo.php | 3 ++- library/Director/Web/Table/ObjectsTableSetMembers.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/library/Director/DirectorObject/Lookup/ServiceSetServiceInfo.php b/library/Director/DirectorObject/Lookup/ServiceSetServiceInfo.php index a980da88..d8e81cb3 100644 --- a/library/Director/DirectorObject/Lookup/ServiceSetServiceInfo.php +++ b/library/Director/DirectorObject/Lookup/ServiceSetServiceInfo.php @@ -3,6 +3,7 @@ namespace Icinga\Module\Director\DirectorObject\Lookup; use gipfl\IcingaWeb2\Url; +use Icinga\Module\Director\Db\DbUtil; use Icinga\Module\Director\Objects\IcingaHost; use Icinga\Module\Director\Repository\IcingaTemplateRepository; use Ramsey\Uuid\Uuid; @@ -75,7 +76,7 @@ class ServiceSetServiceInfo implements ServiceInfo $host->getObjectName(), $serviceName, $row->service_set_name, - Uuid::fromBytes($row->uuid) + Uuid::fromBytes(DbUtil::binaryResult($row->uuid)) ); } diff --git a/library/Director/Web/Table/ObjectsTableSetMembers.php b/library/Director/Web/Table/ObjectsTableSetMembers.php index 6b18ac9a..aaafb100 100644 --- a/library/Director/Web/Table/ObjectsTableSetMembers.php +++ b/library/Director/Web/Table/ObjectsTableSetMembers.php @@ -8,6 +8,7 @@ use gipfl\IcingaWeb2\Link; use gipfl\IcingaWeb2\Table\ZfQueryBasedTable; use gipfl\IcingaWeb2\Url; use Icinga\Module\Director\Db\DbSelectParenthesis; +use Icinga\Module\Director\Db\DbUtil; use Icinga\Module\Director\Db\IcingaObjectFilterHelper; use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Restriction\FilterByNameRestriction; @@ -97,7 +98,7 @@ class ObjectsTableSetMembers extends ZfQueryBasedTable { $url = Url::fromPath('director/service/edit', [ 'name' => $row->object_name, - 'uuid' => Uuid::fromBytes($row->uuid)->toString(), + 'uuid' => Uuid::fromBytes(DbUtil::binaryResult($row->uuid))->toString(), ]); return static::tr([