Better handle the UnconfiguredDataSource case

I wasn't exactly aware of this new development and it needs to be handled a bit differently. (cherry picked from commit 797162a)
quarkusio · Sep 19, 2023 · d8be11a · d8be11a
1 parent e64afbb
commit d8be11a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRecorder.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayRecorder.java
@@ -8,7 +8,6 @@
 import javax.sql.DataSource;
 
 import jakarta.enterprise.inject.Default;
-import jakarta.enterprise.inject.UnsatisfiedResolutionException;
 
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.FlywayExecutor;
@@ -67,7 +66,7 @@ public Function<SyntheticCreationalContext<FlywayContainer>, FlywayContainer> fl
             public FlywayContainer apply(SyntheticCreationalContext<FlywayContainer> context) {
                 DataSource dataSource = context.getInjectedReference(DataSources.class).getDataSource(dataSourceName);
                 if (dataSource instanceof UnconfiguredDataSource) {
-                    throw new UnsatisfiedResolutionException("No datasource present");
+                    return new UnconfiguredDataSourceFlywayContainer(dataSourceName);
                 }
 
                 FlywayContainerProducer flywayProducer = context.getInjectedReference(FlywayContainerProducer.class);
@@ -106,6 +105,10 @@ public void doStartActions(String dataSourceName) {
 
         FlywayContainer flywayContainer = flywayContainerInstanceHandle.get();
 
+        if (flywayContainer instanceof UnconfiguredDataSourceFlywayContainer) {
+            return;
+        }
+
         if (flywayContainer.isCleanAtStart()) {
             flywayContainer.getFlyway().clean();
         }

diff --git a/...untime/src/main/java/io/quarkus/flyway/runtime/UnconfiguredDataSourceFlywayContainer.java b/...untime/src/main/java/io/quarkus/flyway/runtime/UnconfiguredDataSourceFlywayContainer.java
@@ -0,0 +1,16 @@
+package io.quarkus.flyway.runtime;
+
+import org.flywaydb.core.Flyway;
+
+public class UnconfiguredDataSourceFlywayContainer extends FlywayContainer {
+
+    public UnconfiguredDataSourceFlywayContainer(String dataSourceName) {
+        super(null, false, false, false, false, false, dataSourceName, false, false);
+    }
+
+    @Override
+    public Flyway getFlyway() {
+        throw new UnsupportedOperationException(
+                "Cannot get a Flyway instance for unconfigured datasource " + getDataSourceName());
+    }
+}