From 0123d14be24947efa44bc137bb14b2ea4b12d61d Mon Sep 17 00:00:00 2001
From: Tom <schoener@subshell.com>
Date: Wed, 19 Jun 2024 11:35:45 +0200
Subject: [PATCH] [sophora-server]: add support to overwrite derby driver (#98)

---
 charts/sophora-server/Chart.yaml                          | 2 +-
 .../templates/sophora-repository-localdb-configmap.yaml   | 8 ++++----
 charts/sophora-server/values.yaml                         | 6 ++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/charts/sophora-server/Chart.yaml b/charts/sophora-server/Chart.yaml
index b6c7331..8238f3d 100644
--- a/charts/sophora-server/Chart.yaml
+++ b/charts/sophora-server/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.2.1
+version: 2.3.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/sophora-server/templates/sophora-repository-localdb-configmap.yaml b/charts/sophora-server/templates/sophora-repository-localdb-configmap.yaml
index 3055856..d5f7a54 100644
--- a/charts/sophora-server/templates/sophora-repository-localdb-configmap.yaml
+++ b/charts/sophora-server/templates/sophora-repository-localdb-configmap.yaml
@@ -197,7 +197,7 @@ data:
                 <param name="consistencyCheck" value="false" />
                 <param name="minBlobSize" value="16384" />
                 <param name="driver"
-                    value="org.apache.derby.jdbc.EmbeddedDriver" />
+                    value="{{ .Values.sophora.server.persistence.derby.driver }}" />
                 <param name="url"
                     value="jdbc:derby:${wsp.home}/db/itemState;create=true" />
                 <param name="user" value="" />
@@ -252,7 +252,7 @@ data:
                 <param name="consistencyCheck" value="false" />
                 <param name="minBlobSize" value="16384" />
                 <param name="driver"
-                    value="org.apache.derby.jdbc.EmbeddedDriver" />
+                    value="{{ .Values.sophora.server.persistence.derby.driver }}" />
                 <param name="url"
                     value="jdbc:derby:${rep.home}/version/db;create=true" />
                 <param name="user" value="" />
@@ -304,7 +304,7 @@ data:
                 <param name="bundleCacheSize" value="64"/>
                 <param name="consistencyCheck" value="false"/>
                 <param name="minBlobSize" value="16384"/>
-                <param name="driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+                <param name="driver" value="{{ .Values.sophora.server.persistence.derby.driver }}"/>
                 <param name="url" value="jdbc:derby:${wsp.home}/db/itemState;create=true"/>
                 <param name="user" value=""/>
                 <param name="password" value=""/>
@@ -351,7 +351,7 @@ data:
                 <param name="bundleCacheSize" value="64"/>
                 <param name="consistencyCheck" value="false"/>
                 <param name="minBlobSize" value="16384"/>
-                <param name="driver" value="org.apache.derby.jdbc.EmbeddedDriver"/>
+                <param name="driver" value="{{ .Values.sophora.server.persistence.derby.driver }}"/>
                 <param name="url" value="jdbc:derby:${wsp.home}/db/itemState;create=true"/>
                 <param name="user" value=""/>
                 <param name="password" value=""/>
diff --git a/charts/sophora-server/values.yaml b/charts/sophora-server/values.yaml
index b0b2217..c3ea844 100644
--- a/charts/sophora-server/values.yaml
+++ b/charts/sophora-server/values.yaml
@@ -186,6 +186,12 @@ sophora:
       repositoryType: localdb
       ## @param sophora.server.persistence.archiveType string that identifies the archive persistence technology (localdb, mysql or none)
       archiveType: localdb
+
+      derby:
+        ## @param sophora.server.persistence.derby.driver string that specifies the java derby driver. Defaults to "org.apache.derby.jdbc.EmbeddedDriver".
+        ## For Sophora versions newer than 5.4 use "org.apache.derby.iapi.jdbc.AutoloadedDriver".
+        driver: "org.apache.derby.jdbc.EmbeddedDriver"
+
       mysql:
         ## @param sophora.server.persistence.mysql.repositories Array of server main repository connection configurations via secrets.
         ## e.g.