Made the JDBC Schema name customizable

phax · Aug 30, 2020 · ee3459d · ee3459d
1 parent 126ebaf
commit ee3459d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/...-smp-backend-sql/src/main/java/com/helger/phoss/smp/backend/sql/SMPJDBCConfiguration.java b/...-smp-backend-sql/src/main/java/com/helger/phoss/smp/backend/sql/SMPJDBCConfiguration.java
@@ -33,6 +33,7 @@ public final class SMPJDBCConfiguration
   public static final String CONFIG_JDBC_URL = "jdbc.url";
   public static final String CONFIG_JDBC_USER = "jdbc.user";
   public static final String CONFIG_JDBC_PASSWORD = "jdbc.password";
+  public static final String CONFIG_JDBC_SCHEMA = "jdbc.schema";
   public static final String CONFIG_TARGET_DATABASE = "target-database";
 
   @Since ("5.0.6")

diff --git a/...backend-sql/src/main/java/com/helger/phoss/smp/backend/sql/mgr/SMPManagerProviderSQL.java b/...backend-sql/src/main/java/com/helger/phoss/smp/backend/sql/mgr/SMPManagerProviderSQL.java
@@ -79,7 +79,7 @@ public void beforeInitManagers ()
                                               .baselineVersion ("1")
                                               .baselineDescription ("SMP 5.2.x database layout, MySQL only")
                                               .locations ("db/migrate-" + m_eDBType.getID ())
-                                              .schemas ("smp")
+                                              .schemas (aCF.getAsString (SMPJDBCConfiguration.CONFIG_JDBC_SCHEMA, "smp"))
                                               /*
                                                * Avoid scanning the ClassPath by
                                                * enumerating them explicitly

diff --git a/phoss-smp-webapp-sql/src/main/resources/smp-server.properties b/phoss-smp-webapp-sql/src/main/resources/smp-server.properties
@@ -90,13 +90,15 @@ jdbc.driver = com.mysql.cj.jdbc.Driver
 jdbc.url = jdbc:mysql://localhost:3306/smp?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
 jdbc.user = smp
 jdbc.password = smp
+jdbc.schema = smp
 target-database = MySQL
 
 # PostgreSQL example
 #jdbc.driver = org.postgresql.Driver
 #jdbc.url = jdbc:postgresql://localhost:5432/smp
 #jdbc.user = smp
 #jdbc.password = smp
+#jdbc.schema = smp
 #target-database = PostgreSQL
 
 ## Warn if JDBC execution time is exceeded? (since 5.0.6)