From ad7bda17bb0b2656ee26ae0c51393b744ab4dd2a Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Thu, 9 Mar 2023 15:52:16 +0000
Subject: [PATCH] Change database to Service Name in oracle

---
 .../IntegrationConfigForm.svelte                     | 12 ++++++++++--
 packages/server/src/integrations/oracle.ts           |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
index 53d50d57a3..3bc1a1cdd9 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
@@ -74,6 +74,14 @@
     }
     return capitalise(name)
   }
+
+  function getDisplayError(error, configKey) {
+    return error?.replace(
+      new RegExp(`${configKey}`, "i"),
+      getDisplayName(configKey)
+    )
+  }
+
   function getFieldGroupKeys(fieldGroup) {
     return Object.entries(schema[fieldGroup].fields || {})
       .filter(el => filter(el))
@@ -147,7 +155,7 @@
             type={schema[configKey].type}
             on:change
             bind:value={config[configKey]}
-            error={$validation.errors[configKey]}
+            error={getDisplayError($validation.errors[configKey], configKey)}
           />
         </div>
       {:else if schema[configKey].type === "fieldGroup"}
@@ -180,7 +188,7 @@
             type={configKey === "port" ? "string" : schema[configKey].type}
             on:change
             bind:value={config[configKey]}
-            error={$validation.errors[configKey]}
+            error={getDisplayError($validation.errors[configKey], configKey)}
             environmentVariablesEnabled={$licensing.environmentVariablesEnabled}
             {handleUpgradePanel}
           />
diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts
index abf9bcbbe3..65e0829905 100644
--- a/packages/server/src/integrations/oracle.ts
+++ b/packages/server/src/integrations/oracle.ts
@@ -67,6 +67,7 @@ const SCHEMA: Integration = {
     database: {
       type: DatasourceFieldType.STRING,
       required: true,
+      display: "Service Name",
     },
     user: {
       type: DatasourceFieldType.STRING,