Select the datasource by specified name

Author: nakamura-to

deployment/src/test/java/org/seasar/doma/quarkus/deployment/ApplicationPropertiesTest.java

@@ -26,10 +26,10 @@ public class ApplicationPropertiesTest {
                       .addClasses()
                       .add(
                           new StringAsset(
-                              "quarkus.datasource.db-kind=h2\n"
-                                  + "quarkus.datasource.username=USERNAME-NAMED\n"
-                                  + "quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:testing\n"
-                                  + "quarkus.datasource.jdbc.driver=org.h2.Driver\n"
+                              "quarkus.datasource.sales.db-kind=h2\n"
+                                  + "quarkus.datasource.sales.username=USERNAME-NAMED\n"
+                                  + "quarkus.datasource.sales.jdbc.url=jdbc:h2:tcp://localhost/mem:testing\n"
+                                  + "quarkus.datasource.sales.jdbc.driver=org.h2.Driver\n"
                                   + "quarkus.doma.dialect=postgres\n"
                                   + "quarkus.doma.sql-file-repository=no-cache\n"
                                   + "quarkus.doma.naming=upper-case\n"

deployment/src/test/java/org/seasar/doma/quarkus/deployment/DataSourceNameTest.java

@@ -0,0 +1,53 @@
+package org.seasar.doma.quarkus.deployment;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import io.agroal.api.AgroalDataSource;
+import io.quarkus.agroal.DataSource;
+import io.quarkus.test.QuarkusUnitTest;
+import javax.inject.Inject;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.seasar.doma.jdbc.Config;
+
+public class DataSourceNameTest {
+
+  @RegisterExtension
+  static QuarkusUnitTest runner =
+      new QuarkusUnitTest()
+          .setArchiveProducer(
+              () ->
+                  ShrinkWrap.create(JavaArchive.class)
+                      .add(
+                          new StringAsset(
+                              "quarkus.datasource.db-kind=h2\n"
+                                  + "quarkus.datasource.username=USERNAME-NAMED\n"
+                                  + "quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:testing\n"
+                                  + "quarkus.datasource.jdbc.driver=org.h2.Driver\n"
+                                  + "quarkus.datasource.inventory.db-kind=h2\n"
+                                  + "quarkus.datasource.inventory.username=USERNAME-NAMED\n"
+                                  + "quarkus.datasource.inventory.jdbc.url=jdbc:h2:tcp://localhost/mem:testing\n"
+                                  + "quarkus.datasource.inventory.jdbc.driver=org.h2.Driver\n"
+                                  + "quarkus.doma.datasource-name=inventory\n"),
+                          "application.properties"));
+
+  @Inject Config config;
+
+  @Inject AgroalDataSource defaultDataSource;
+
+  @Inject
+  @DataSource("inventory")
+  AgroalDataSource inventoryDataSource;
+
+  @Test
+  void test() {
+    assertNotNull(config.getDataSource());
+    assertNotEquals(config.getDataSource(), defaultDataSource);
+    assertEquals(config.getDataSource(), inventoryDataSource);
+  }
+}

deployment/src/test/java/org/seasar/doma/quarkus/deployment/MultipleConfigTest.java

@@ -57,7 +57,9 @@ Config inventoryConfig(
   @Test
   void test() {
     assertNotNull(defaultConfig);
+    assertNotNull(defaultConfig.getDataSource());
     assertNotNull(inventoryConfig);
+    assertNotNull(inventoryConfig.getDataSource());
     assertNotEquals(defaultConfig, inventoryConfig);
   }
 }

runtime/pom.xml

@@ -22,6 +22,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-agroal</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.seasar.doma</groupId>
             <artifactId>doma-core</artifactId>

runtime/src/main/java/org/seasar/doma/quarkus/runtime/DomaProducer.java

@@ -1,10 +1,14 @@
 package org.seasar.doma.quarkus.runtime;
 
 import io.quarkus.arc.DefaultBean;
+import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.runtime.Startup;
 import java.util.Objects;
 import java.util.Optional;
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Instance;
 import javax.inject.Singleton;
 import javax.sql.DataSource;
 import org.seasar.doma.jdbc.ClassHelper;
@@ -184,7 +188,7 @@ TransactionManager transactionManager() {
   @ApplicationScoped
   @DefaultBean
   DbConfig dbConfig(
-      DataSource dataSource,
+      @Any Instance<DataSource> dataSourceInstance,
       Dialect dialect,
       SqlFileRepository sqlFileRepository,
       ScriptFileLoader scriptFileLoader,
@@ -200,6 +204,8 @@ DbConfig dbConfig(
       Commenter commenter,
       EntityListenerProvider entityListenerProvider,
       TransactionManager transactionManager) {
+    Objects.requireNonNull(dataSourceName);
+    DataSource dataSource = selectDataSource(dataSourceInstance, dataSourceName);
     return new DbConfig(
         dataSource,
         dialect,
@@ -224,6 +230,15 @@ DbConfig dbConfig(
         queryTimeout);
   }
 
+  private DataSource selectDataSource(Instance<DataSource> instance, String name) {
+    if (DataSourceUtil.isDefault(name)) {
+      return instance.select(Default.Literal.INSTANCE).get();
+    }
+    io.quarkus.agroal.DataSource qualifier =
+        new io.quarkus.agroal.DataSource.DataSourceLiteral(name);
+    return instance.select(qualifier).get();
+  }
+
   @ApplicationScoped
   @DefaultBean
   Entityql entityql(Config config) {