From 1b91a93e3436fa6c664b0668badd937077bd1fa6 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 17 Jul 2023 13:46:49 +0200 Subject: [PATCH 1/2] Make `host` optional for `oci` database resources `oci` uses Zend's `Oracle` adapter, which does not use this setting at all. --- application/forms/Config/Resource/DbResourceForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php index b9979eed5..331731368 100644 --- a/application/forms/Config/Resource/DbResourceForm.php +++ b/application/forms/Config/Resource/DbResourceForm.php @@ -58,7 +58,7 @@ class DbResourceForm extends Form $offerMysql = true; } - if ($dbChoice === 'oracle') { + if ($dbChoice === 'oracle' || $dbChoice === 'oci') { $hostIsRequired = false; } else { $hostIsRequired = true; From b6933694122f99b00a99fd8691eb65ac14617005 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 17 Jul 2023 13:53:14 +0200 Subject: [PATCH 2/2] Fix class in `Platform::hasOracleSupport()` --- library/Icinga/Application/Platform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Icinga/Application/Platform.php b/library/Icinga/Application/Platform.php index 025bf7729..185a69e92 100644 --- a/library/Icinga/Application/Platform.php +++ b/library/Icinga/Application/Platform.php @@ -406,7 +406,7 @@ class Platform */ public static function hasOracleSupport() { - return static::extensionLoaded('pdo_oci') && static::classExists('Zend_Db_Adapter_Pdo_Mysql'); + return static::extensionLoaded('pdo_oci') && static::classExists('Zend_Db_Adapter_Pdo_Oci'); } /**