From 951f0241ab4ff8144d1e6126338a0e8977f3fa70 Mon Sep 17 00:00:00 2001
From: Adam Brokes <abrokes@atlassian.com>
Date: Mon, 3 Aug 2020 15:13:15 +1000
Subject: [PATCH] DCD-963: Use the ATL_DB_PREFERREDTESTQUERY parameter from
 Confluence AWS Quickstart

---
 roles/confluence_config/defaults/main.yml               | 1 +
 roles/confluence_config/templates/confluence.cfg.xml.j2 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/roles/confluence_config/defaults/main.yml b/roles/confluence_config/defaults/main.yml
index f9ffa4e..86502fc 100644
--- a/roles/confluence_config/defaults/main.yml
+++ b/roles/confluence_config/defaults/main.yml
@@ -9,6 +9,7 @@ atl_db_idletestperiod: "{{ lookup('env', 'ATL_DB_IDLETESTPERIOD') or '100' }}"
 atl_db_maxstatements: "{{ lookup('env', 'ATL_DB_MAXSTATEMENTS') or '0' }}"
 atl_db_validate: "{{ lookup('env', 'ATL_DB_VALIDATE') or 'false' }}"
 atl_db_acquireincrement: "{{ lookup('env', 'ATL_DB_ACQUIREINCREMENT') or '1' }}"
+atl_db_preferredtestquery: "{{ lookup('env', 'ATL_DB_PREFERREDTESTQUERY') or 'select version();' }}"
 
 atl_hazelcast_network_aws_tag_key: "Cluster"
 atl_hazelcast_network_aws_host_header: "ec2.amazonaws.com"
diff --git a/roles/confluence_config/templates/confluence.cfg.xml.j2 b/roles/confluence_config/templates/confluence.cfg.xml.j2
index b6e78ba..d0689d2 100644
--- a/roles/confluence_config/templates/confluence.cfg.xml.j2
+++ b/roles/confluence_config/templates/confluence.cfg.xml.j2
@@ -24,7 +24,7 @@
     <property name="hibernate.c3p0.max_statements">{{ atl_db_maxstatements }}</property>
     <property name="hibernate.c3p0.validate">{{ atl_db_validate }}</property>
     <property name="hibernate.c3p0.acquire_increment">{{ atl_db_acquireincrement }}</property>
-    <property name="hibernate.c3p0.preferredTestQuery">select version();</property>
+    <property name="hibernate.c3p0.preferredTestQuery">{{ atl_db_preferredtestquery }}</property>
 
     <property name="shared-home">{{ atl_product_home_shared }}</property>
     <property name="confluence.cluster">true</property>