Merge pull request #29894 from gsmet/mariadb-reactive-dev-services

Support MariaDB Dev Services in reactive-mysql-client
quarkusio · Dec 16, 2022 · 65f9a18 · 65f9a18
2 parents 8d40e63 + 69eea65
commit 65f9a18
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/...ain/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java b/...ain/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java
@@ -200,8 +200,8 @@ private RunningDevService startDevDb(String dbName,
         boolean explicitlyDisabled = !(dataSourceBuildTimeConfig.devservices.enabled.orElse(true));
         if (explicitlyDisabled) {
             //explicitly disabled
-            log.debug("Not starting devservices for " + (dbName == null ? "default datasource" : dbName)
-                    + " as it has been disabled in the config");
+            log.debug("Not starting Dev Services for " + (dbName == null ? "default datasource" : dbName)
+                    + " as it has been disabled in the configuration");
             return null;
         }
 
@@ -222,8 +222,8 @@ private RunningDevService startDevDb(String dbName,
         List<DevServicesDatasourceConfigurationHandlerBuildItem> configHandlers = configurationHandlerBuildItems
                 .get(defaultDbKind.get());
         if (devDbProvider == null || configHandlers == null) {
-            log.warn("Unable to start devservices for " + (dbName == null ? "default datasource" : dbName)
-                    + " as this datasource type (" + defaultDbKind.get() + ") does not support devservices");
+            log.warn("Unable to start Dev Services for " + (dbName == null ? "default datasource" : dbName)
+                    + " as this datasource type (" + defaultDbKind.get() + ") does not support Dev Services");
             return null;
         }
 
@@ -232,7 +232,7 @@ private RunningDevService startDevDb(String dbName,
                 if (i.getCheckConfiguredFunction().test(dbName)) {
                     //this database has explicit configuration
                     //we don't start the devservices
-                    log.debug("Not starting devservices for " + (dbName == null ? "default datasource" : dbName)
+                    log.debug("Not starting Dev Services for " + (dbName == null ? "default datasource" : dbName)
                             + " as it has explicit configuration");
                     return null;
                 }

diff --git a/.../src/main/java/io/quarkus/devservices/mariadb/deployment/MariaDBDevServicesProcessor.java b/.../src/main/java/io/quarkus/devservices/mariadb/deployment/MariaDBDevServicesProcessor.java
@@ -118,7 +118,7 @@ public String getEffectiveJdbcUrl() {
         }
 
         public String getReactiveUrl() {
-            return getEffectiveJdbcUrl().replaceFirst("jdbc:", "vertx-reactive:");
+            return getEffectiveJdbcUrl().replaceFirst("jdbc:mariadb:", "vertx-reactive:mysql:");
         }
     }
 }
diff --git a/extensions/reactive-mysql-client/deployment/pom.xml b/extensions/reactive-mysql-client/deployment/pom.xml
@@ -60,6 +60,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-devservices-mysql</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-devservices-mariadb</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/...c/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java b/...c/main/java/io/quarkus/reactive/mysql/client/deployment/ReactiveMySQLClientProcessor.java
@@ -84,8 +84,9 @@ ServiceStartBuildItem build(BuildProducer<FeatureBuildItem> feature,
     }
 
     @BuildStep
-    DevServicesDatasourceConfigurationHandlerBuildItem devDbHandler() {
-        return DevServicesDatasourceConfigurationHandlerBuildItem.reactive(DatabaseKind.MYSQL);
+    List<DevServicesDatasourceConfigurationHandlerBuildItem> devDbHandler() {
+        return List.of(DevServicesDatasourceConfigurationHandlerBuildItem.reactive(DatabaseKind.MYSQL),
+                DevServicesDatasourceConfigurationHandlerBuildItem.reactive(DatabaseKind.MARIADB));
     }
 
     @BuildStep