From 5fa5a6e07bb0ec718f71fa32457fc36e2d5de2aa Mon Sep 17 00:00:00 2001
From: Andrii Serkes <andrii.serkes@oracle.com>
Date: Tue, 30 Aug 2022 23:42:51 +0200
Subject: [PATCH] fix db issues in Helidon archetype (#4805)

* add configuration to connect to DB and script to initialize DB
---
 .../META-INF/microprofile-config.properties.mustache |  8 ++++----
 .../src/main/archetype/mp/custom/database.xml        | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache
index 426b898f95e..a9abb5ceba8 100644
--- a/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache
+++ b/archetypes/helidon/src/main/archetype/mp/common/files/src/main/resources/META-INF/microprofile-config.properties.mustache
@@ -13,12 +13,12 @@ metrics.rest-request.enabled=false
 # Datasource properties
 javax.sql.DataSource.{{ds-name}}.dataSourceClassName={{jdbcDataSource}}
 javax.sql.DataSource.{{ds-name}}.dataSource.url={{databaseUrl}}
-javax.sql.DataSource.{{ds-name}}.dataSource.user=db_user
-javax.sql.DataSource.{{ds-name}}.dataSource.password=user_password
+javax.sql.DataSource.{{ds-name}}.dataSource.user={{dbUser}}
+javax.sql.DataSource.{{ds-name}}.dataSource.password={{userPassword}}
 {{/database-hikari}}
 {{#database-ucp}}
 oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.url={{databaseUrl}}
 oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.connectionFactoryClassName={{jdbcDataSource}}
-oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.user=db_user
-oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.password=user_password
+oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.user={{dbUser}}
+oracle.ucp.jdbc.PoolDataSource.{{ds-name}}.password={{userPassword}}
 {{/database-ucp}}
\ No newline at end of file
diff --git a/archetypes/helidon/src/main/archetype/mp/custom/database.xml b/archetypes/helidon/src/main/archetype/mp/custom/database.xml
index 8085030f32c..3ca536aa75a 100644
--- a/archetypes/helidon/src/main/archetype/mp/custom/database.xml
+++ b/archetypes/helidon/src/main/archetype/mp/custom/database.xml
@@ -196,6 +196,8 @@ Instructions for H2 can be found here: https://www.h2database.com/html/cheatShee
                                     </list>
                                     <value key="jdbcDataSource">org.h2.jdbcx.JdbcDataSource</value>
                                     <value key="databaseUrl">jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</value>
+                                    <value key="dbUser">sa</value>
+                                    <value key="userPassword"></value>
                                     <list key="MainTest-methods">
                                         <value><![CDATA[
     @Test
@@ -306,6 +308,9 @@ docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_D
                                         </map>
                                     </list>
                                     <value key="jdbcDataSource">com.mysql.cj.jdbc.MysqlDataSource</value>
+                                    <value key="databaseUrl">jdbc:mysql://127.0.0.1:3306/pokemon?useSSL=false</value>
+                                    <value key="dbUser">user</value>
+                                    <value key="userPassword">password</value>
                                 </model>
                             </output>
                         </option>
@@ -346,6 +351,9 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
                                         </map>
                                     </list>
                                     <value key="jdbcDataSource">oracle.jdbc.pool.OracleDataSource</value>
+                                    <value key="databaseUrl">jdbc:oracle:thin:@localhost:1521:XE</value>
+                                    <value key="dbUser">sys as sysdba</value>
+                                    <value key="userPassword">oracle</value>
                                 </model>
                             </output>
                         </option>
@@ -362,6 +370,10 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
                                         <value key="name">eclipselink.ddl-generation</value>
                                         <value key="value">drop-and-create-tables</value>
                                     </map>
+                                    <map if="${..server} != 'h2'">
+                                        <value key="name">jakarta.persistence.sql-load-script-source</value>
+                                        <value key="value">META-INF/init_script.sql</value>
+                                    </map>
                                 </list>
                             </model>
                         </output>