Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

DCD-1238: Add database type mapping for oracle which supports oracle 12c and 19c in Confluence 7.3.1+

Browse Source
This commit is contained in:
Ben Partridge 2021-03-05 10:53:21 +11:00
parent 5654d4c095
commit 78fa23866f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/confluence.cfg.xml.j2
View File

@ -13,12 +13,14 @@
<property name="lucene.index.dir">{{ atl_lucene_index_dir | default('${confluenceHome}/index') }}</property> <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 %} {% if atl_jdbc_url is defined %}
{% set databases = { {% set databases = {
"mysql": ["com.mysql.jdbc.Driver", "MySQLDialect"], "mysql": ["com.mysql.jdbc.Driver", "MySQLDialect"],
"postgresql": ["org.postgresql.Driver", "PostgreSQLDialect"], "postgresql": ["org.postgresql.Driver", "PostgreSQLDialect"],
"mssql": ["com.microsoft.sqlserver.jdbc.SQLServerDriver", "SQLServerDialect"], "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> <property name="confluence.database.choice">{{ atl_db_type }}</property>