Added support for multiple init scripts

giamma-frangipane · Jan 10, 2025 · 7df6602 · 7df6602
1 parent f040b40
commit 7df6602
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 15 deletions.
diff --git a/.../main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceContainerConfig.java b/.../main/java/io/quarkus/datasource/deployment/spi/DevServicesDatasourceContainerConfig.java
@@ -1,5 +1,6 @@
 package io.quarkus.datasource.deployment.spi;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -15,7 +16,7 @@ public class DevServicesDatasourceContainerConfig {
     private final Optional<String> dbName;
     private final Optional<String> username;
     private final Optional<String> password;
-    private final Optional<String> initScriptPath;
+    private final Optional<List<String>> initScriptsPaths;
     private final Map<String, String> volumes;
     private final boolean reuse;
     private final boolean showLogs;
@@ -29,7 +30,7 @@ public DevServicesDatasourceContainerConfig(Optional<String> imageName,
             Optional<String> dbName,
             Optional<String> username,
             Optional<String> password,
-            Optional<String> initScriptPath,
+            Optional<List<String>> initScriptsPaths,
             Map<String, String> volumes,
             boolean reuse,
             boolean showLogs) {
@@ -42,7 +43,7 @@ public DevServicesDatasourceContainerConfig(Optional<String> imageName,
         this.dbName = dbName;
         this.username = username;
         this.password = password;
-        this.initScriptPath = initScriptPath;
+        this.initScriptsPaths = initScriptsPaths;
         this.volumes = volumes;
         this.reuse = reuse;
         this.showLogs = showLogs;
@@ -84,8 +85,8 @@ public Optional<String> getPassword() {
         return password;
     }
 
-    public Optional<String> getInitScriptPath() {
-        return initScriptPath;
+    public Optional<List<String>> getInitScriptsPaths() {
+        return initScriptsPaths;
     }
 
     public boolean isShowLogs() {

diff --git a/...ain/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java b/...ain/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java
@@ -175,7 +175,7 @@ private static Map<String, Object> buildMapFromBuildConfig(DataSourcesBuildTimeC
             res.put(name + ".devservices.container-properties.", config.devservices().containerProperties());
             res.put(name + ".devservices.db-name", config.devservices().dbName());
             res.put(name + ".devservices.image-name", config.devservices().imageName());
-            res.put(name + ".devservices.init-script-path", config.devservices().initScriptPath());
+            res.put(name + ".devservices.init-script-path", config.devservices().initScriptsPaths());
             res.put(name + ".devservices.password", config.devservices().password());
             res.put(name + ".devservices.port", config.devservices().port());
             res.put(name + ".devservices.properties", config.devservices().properties());
@@ -286,7 +286,7 @@ private RunningDevService startDevDb(
                     dataSourceBuildTimeConfig.devservices().dbName(),
                     dataSourceBuildTimeConfig.devservices().username(),
                     dataSourceBuildTimeConfig.devservices().password(),
-                    dataSourceBuildTimeConfig.devservices().initScriptPath(),
+                    dataSourceBuildTimeConfig.devservices().initScriptsPaths(),
                     dataSourceBuildTimeConfig.devservices().volumes(),
                     dataSourceBuildTimeConfig.devservices().reuse(),
                     dataSourceBuildTimeConfig.devservices().showLogs());

diff --git a/...ource/runtime/src/main/java/io/quarkus/datasource/runtime/DevServicesBuildTimeConfig.java b/...ource/runtime/src/main/java/io/quarkus/datasource/runtime/DevServicesBuildTimeConfig.java
@@ -1,5 +1,6 @@
 package io.quarkus.datasource.runtime;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalInt;
@@ -83,11 +84,11 @@ public interface DevServicesBuildTimeConfig {
     Optional<String> password();
 
     /**
-     * The path to a SQL script to be loaded from the classpath and applied to the Dev Service database.
+     * The paths to SQL scripts to be loaded from the classpath and applied to the Dev Service database.
      * <p>
      * This has no effect if the provider is not a container-based database, such as H2 or Derby.
      */
-    Optional<String> initScriptPath();
+    Optional<List<@WithConverter(TrimmedStringConverter.class) String>> initScriptsPaths();
 
     /**
      * The volumes to be mapped to the container.

diff --git a/...ices/db2/src/main/java/io/quarkus/devservices/db2/deployment/DB2DevServicesProcessor.java b/...ices/db2/src/main/java/io/quarkus/devservices/db2/deployment/DB2DevServicesProcessor.java
@@ -65,7 +65,7 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
 
                 containerConfig.getAdditionalJdbcUrlProperties().forEach(container::withUrlParam);
                 containerConfig.getCommand().ifPresent(container::setCommand);
-                containerConfig.getInitScriptPath().ifPresent(container::withInitScript);
+                containerConfig.getInitScriptsPaths().ifPresent(container::withInitScripts);
                 if (containerConfig.isShowLogs()) {
                     container.withLogConsumer(new JBossLoggingConsumer(LOG));
                 }

diff --git a/.../src/main/java/io/quarkus/devservices/mariadb/deployment/MariaDBDevServicesProcessor.java b/.../src/main/java/io/quarkus/devservices/mariadb/deployment/MariaDBDevServicesProcessor.java
@@ -74,7 +74,7 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
 
                 containerConfig.getAdditionalJdbcUrlProperties().forEach(container::withUrlParam);
                 containerConfig.getCommand().ifPresent(container::setCommand);
-                containerConfig.getInitScriptPath().ifPresent(container::withInitScript);
+                containerConfig.getInitScriptsPaths().ifPresent(container::withInitScripts);
                 if (containerConfig.isShowLogs()) {
                     container.withLogConsumer(new JBossLoggingConsumer(LOG));
                 }

diff --git a/...ssql/src/main/java/io/quarkus/devservices/mssql/deployment/MSSQLDevServicesProcessor.java b/...ssql/src/main/java/io/quarkus/devservices/mssql/deployment/MSSQLDevServicesProcessor.java
@@ -65,7 +65,7 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
 
                 containerConfig.getAdditionalJdbcUrlProperties().forEach(container::withUrlParam);
                 containerConfig.getCommand().ifPresent(container::setCommand);
-                containerConfig.getInitScriptPath().ifPresent(container::withInitScript);
+                containerConfig.getInitScriptsPaths().ifPresent(container::withInitScripts);
                 if (containerConfig.isShowLogs()) {
                     container.withLogConsumer(new JBossLoggingConsumer(LOG));
                 }

diff --git a/...ysql/src/main/java/io/quarkus/devservices/mysql/deployment/MySQLDevServicesProcessor.java b/...ysql/src/main/java/io/quarkus/devservices/mysql/deployment/MySQLDevServicesProcessor.java
@@ -73,7 +73,7 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
 
                 containerConfig.getAdditionalJdbcUrlProperties().forEach(container::withUrlParam);
                 containerConfig.getCommand().ifPresent(container::setCommand);
-                containerConfig.getInitScriptPath().ifPresent(container::withInitScript);
+                containerConfig.getInitScriptsPaths().ifPresent(container::withInitScripts);
                 if (containerConfig.isShowLogs()) {
                     container.withLogConsumer(new JBossLoggingConsumer(LOG));
                 }

diff --git a/...le/src/main/java/io/quarkus/devservices/oracle/deployment/OracleDevServicesProcessor.java b/...le/src/main/java/io/quarkus/devservices/oracle/deployment/OracleDevServicesProcessor.java
@@ -79,7 +79,7 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
 
                 containerConfig.getAdditionalJdbcUrlProperties().forEach(container::withUrlParam);
                 containerConfig.getCommand().ifPresent(container::setCommand);
-                containerConfig.getInitScriptPath().ifPresent(container::withInitScript);
+                containerConfig.getInitScriptsPaths().ifPresent(container::withInitScripts);
                 if (containerConfig.isShowLogs()) {
                     container.withLogConsumer(new JBossLoggingConsumer(LOG));
                 }

diff --git a/...ain/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java b/...ain/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java
@@ -88,7 +88,7 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                 }
                 container.setCommand(augmentedCommand);
 
-                containerConfig.getInitScriptPath().ifPresent(container::withInitScript);
+                containerConfig.getInitScriptsPaths().ifPresent(container::withInitScripts);
                 if (containerConfig.isShowLogs()) {
                     container.withLogConsumer(new JBossLoggingConsumer(LOG));
                 }