Making sure to return the primary mapped driver if the readonly database

is equal to the primary database.
nextgenhealthcare · May 22, 2019 · 862dd36 · 862dd36
1 parent 2e2b53e
commit 862dd36
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/server/src/com/mirth/connect/model/DatabaseSettings.java b/server/src/com/mirth/connect/model/DatabaseSettings.java
@@ -236,10 +236,10 @@ String getMappedDatabaseDriver() {
 
     String getMappedReadOnlyDatabaseDriver() {
         if (StringUtils.isBlank(databaseReadOnlyDriver)) {
-            if (StringUtils.isBlank(getDatabaseReadOnly())) {
-                return getMappedDatabaseDriver();
-            } else {
+            if (StringUtils.isNotBlank(getDatabaseReadOnly()) && !StringUtils.equalsIgnoreCase(getDatabase(), getDatabaseReadOnly())) {
                 return MapUtils.getString(databaseDriverMap, getDatabaseReadOnly());
+            } else {
+                return getMappedDatabaseDriver();
             }
         } else {
             return databaseReadOnlyDriver;

diff --git a/server/test/com/mirth/connect/model/DatabaseSettingsTest.java b/server/test/com/mirth/connect/model/DatabaseSettingsTest.java
@@ -26,23 +26,23 @@ public void getMappedDatabaseDriver_NullDriver_InvalidDatabase() throws Exceptio
         databaseSettings.setDatabaseDriver(null);
         assertNull(databaseSettings.getMappedDatabaseDriver());
     }
-    
+
     @Test
     public void getMappedDatabaseDriver_BlankDriver_ValidDatabase() throws Exception {
         DatabaseSettings databaseSettings = new DatabaseSettings();
         databaseSettings.setDatabase("postgres");
         databaseSettings.setDatabaseDriver(" ");
         assertEquals("org.postgresql.Driver", databaseSettings.getMappedDatabaseDriver());
     }
-    
+
     @Test
     public void getMappedDatabaseDriver_NonBlankDriver() throws Exception {
         DatabaseSettings databaseSettings = new DatabaseSettings();
         databaseSettings.setDatabase("mysql");
         databaseSettings.setDatabaseDriver("test");
         assertEquals("test", databaseSettings.getMappedDatabaseDriver());
     }
-    
+
     @Test
     public void getMappedReadOnlyDatabaseDriver_NullDriver_NullRODriver_NullDatabaseRO() throws Exception {
         DatabaseSettings databaseSettings = spy(new DatabaseSettings());
@@ -53,7 +53,7 @@ public void getMappedReadOnlyDatabaseDriver_NullDriver_NullRODriver_NullDatabase
         assertEquals("oracle.jdbc.OracleDriver", databaseSettings.getMappedReadOnlyDatabaseDriver());
         verify(databaseSettings, times(1)).getMappedDatabaseDriver();
     }
-    
+
     @Test
     public void getMappedReadOnlyDatabaseDriver_NullDriver_NullRODriver_InvalidDatabaseRO() throws Exception {
         DatabaseSettings databaseSettings = spy(new DatabaseSettings());
@@ -64,7 +64,18 @@ public void getMappedReadOnlyDatabaseDriver_NullDriver_NullRODriver_InvalidDatab
         assertNull(databaseSettings.getMappedReadOnlyDatabaseDriver());
         verify(databaseSettings, times(0)).getMappedDatabaseDriver();
     }
-
+
+    @Test
+    public void getMappedReadOnlyDatabaseDriver_NullDriver_NullRODriver_DifferentDatabaseRO() throws Exception {
+        DatabaseSettings databaseSettings = spy(new DatabaseSettings());
+        databaseSettings.setDatabase("oracle");
+        databaseSettings.setDatabaseDriver(null);
+        databaseSettings.setDatabaseReadOnly("mysql");
+        databaseSettings.setDatabaseReadOnlyDriver(null);
+        assertEquals("com.mysql.cj.jdbc.Driver", databaseSettings.getMappedReadOnlyDatabaseDriver());
+        verify(databaseSettings, times(0)).getMappedDatabaseDriver();
+    }
+
     @Test
     public void getMappedReadOnlyDatabaseDriver_NullDriver_NullRODriver_ValidDatabaseRO() throws Exception {
         DatabaseSettings databaseSettings = spy(new DatabaseSettings());
@@ -75,7 +86,7 @@ public void getMappedReadOnlyDatabaseDriver_NullDriver_NullRODriver_ValidDatabas
         assertEquals("net.sourceforge.jtds.jdbc.Driver", databaseSettings.getMappedReadOnlyDatabaseDriver());
         verify(databaseSettings, times(0)).getMappedDatabaseDriver();
     }
-    
+
     @Test
     public void getMappedReadOnlyDatabaseDriver_NonBlankRODriver() throws Exception {
         DatabaseSettings databaseSettings = spy(new DatabaseSettings());