Fix pgsql binary resource handling for uuids

This commit is contained in:
raviks789 2024-12-05 10:11:09 +01:00 committed by Eric Lippmann
parent 89ebf71d88
commit 175de1ae84
2 changed files with 4 additions and 2 deletions

View File

@ -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))
);
}

View File

@ -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([