From 78fa23866f53547b88f75838bfd5c2921147966c Mon Sep 17 00:00:00 2001
From: Ben Partridge <bpartridge@atlassian.com>
Date: Fri, 5 Mar 2021 10:53:21 +1100
Subject: [PATCH] DCD-1238: Add database type mapping for oracle which supports
 oracle 12c and 19c in Confluence 7.3.1+

---
 config/confluence.cfg.xml.j2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/confluence.cfg.xml.j2 b/config/confluence.cfg.xml.j2
index 24b2887..b0bfcd0 100644
--- a/config/confluence.cfg.xml.j2
+++ b/config/confluence.cfg.xml.j2
@@ -13,12 +13,14 @@
 
     <property name="lucene.index.dir">{{ atl_lucene_index_dir | default('${confluenceHome}/index') }}</property>
 
+    {# We need mappings for "oracle12c" and "oracle" to remain backwards compatible with Confluence 7.3.0 and earlier. Oracle 19c support was added in Confluence 7.3.1 and changed the database type name for oracle databases from "oracle12c" to "oracle" #}
     {% if atl_jdbc_url is defined %}
       {% set databases =  {
            "mysql": ["com.mysql.jdbc.Driver", "MySQLDialect"],
            "postgresql": ["org.postgresql.Driver", "PostgreSQLDialect"],
            "mssql": ["com.microsoft.sqlserver.jdbc.SQLServerDriver", "SQLServerDialect"],
-           "oracle12c": ["oracle.jdbc.driver.OracleDriver", "OracleDialect"]
+           "oracle12c": ["oracle.jdbc.driver.OracleDriver", "OracleDialect"],
+           "oracle": ["oracle.jdbc.driver.OracleDriver", "OracleDialect"]
           } %}
       <property name="confluence.database.choice">{{ atl_db_type }}</property>