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

Merged in DCD-1238-fix-oracle-database-type (pull request #80)

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

Approved-by: Steve Smith
Approved-by: Nasser Ghazali-Beiklar
This commit is contained in:
Ben Partridge 2021-03-05 05:29:10 +00:00
commit 42592fab7e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -198,7 +198,8 @@ The following variables are all must all be supplied if using this feature:
* `mssql` * `mssql`
* `mysql` * `mysql`
* `oracle12c` * `oracle12c` (Confluence 7.3.0 or earlier only)
* `oracle` (Confluence 7.3.1 or later only. Compatible with Oracle 12c and Oracle 19c)
* `postgresql` * `postgresql`
Note: Due to licensing restrictions Confluence does not ship with a MySQL or Note: Due to licensing restrictions Confluence does not ship with a MySQL or

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>