Use JdbcConnectionDetails to detect Dialect

instead of Environment

closes gh-286

Author: making

doma-spring-boot-autoconfigure/pom.xml

@@ -61,6 +61,11 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>

doma-spring-boot-autoconfigure/src/main/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfiguration.java

@@ -39,19 +39,18 @@
 import org.seasar.doma.jdbc.dialect.StandardDialect;
 import org.seasar.doma.jdbc.statistic.DefaultStatisticManager;
 import org.seasar.doma.jdbc.statistic.StatisticManager;
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.jdbc.DatabaseDriver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
@@ -76,12 +75,12 @@ public class DomaAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public Dialect dialect(Environment environment) {
+	public Dialect dialect(JdbcConnectionDetails connectionDetails) {
 		DialectType dialectType = domaProperties.getDialect();
 		if (dialectType != null) {
 			return dialectType.create();
 		}
-		String url = environment.getProperty("spring.datasource.url");
+		String url = connectionDetails.getJdbcUrl();
 		if (url != null) {
 			DatabaseDriver databaseDriver = DatabaseDriver.fromJdbcUrl(url);
 			switch (databaseDriver) {

doma-spring-boot-autoconfigure/src/test/java/org/seasar/doma/boot/autoconfigure/DomaAutoConfigurationTest.java

@@ -49,7 +49,6 @@
 import org.seasar.doma.jdbc.criteria.NativeSql;
 import org.seasar.doma.jdbc.criteria.QueryDsl;
 import org.seasar.doma.jdbc.dialect.Dialect;
-import org.seasar.doma.jdbc.dialect.H2Dialect;
 import org.seasar.doma.jdbc.dialect.MysqlDialect;
 import org.seasar.doma.jdbc.dialect.PostgresDialect;
 import org.seasar.doma.jdbc.dialect.StandardDialect;
@@ -58,6 +57,7 @@
 import org.seasar.doma.message.Message;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -263,11 +263,44 @@ public void testDialectByDataSourceUrl() {
 		MutablePropertySources sources = context.getEnvironment()
 				.getPropertySources();
 		sources.addFirst(new MapPropertySource("test",
-				Collections.singletonMap("spring.datasource.url", "jdbc:h2:mem:example")));
+				Map.of("spring.datasource.url", "jdbc:postgresql://localhost:1234/example",
+						"doma.exception-translation-enabled",
+						"false" /* prevent database connections */)));
 		this.context.register(DomaAutoConfiguration.class, DataSourceAutoConfiguration.class);
 		this.context.refresh();
 		Dialect dialect = this.context.getBean(Dialect.class);
-		assertThat(dialect, is(instanceOf(H2Dialect.class)));
+		assertThat(dialect, is(instanceOf(PostgresDialect.class)));
+	}
+
+	@Test
+	public void testDialectByJdbConnectionDetails() {
+		MutablePropertySources sources = context.getEnvironment()
+				.getPropertySources();
+		sources.addFirst(new MapPropertySource("test",
+				Map.of("doma.exception-translation-enabled",
+						"false"/* prevent database connections */)));
+		EnvironmentTestUtils.addEnvironment(this.context,
+				"doma.exception-translation-enabled:false"); // Prevent database connections
+		this.context.register(DomaAutoConfiguration.class, DataSourceAutoConfiguration.class);
+		this.context.registerBean(JdbcConnectionDetails.class, () -> new JdbcConnectionDetails() {
+			@Override
+			public String getUsername() {
+				return "dummy";
+			}
+
+			@Override
+			public String getPassword() {
+				return "dummy";
+			}
+
+			@Override
+			public String getJdbcUrl() {
+				return "jdbc:postgresql://localhost:1234/example";
+			}
+		});
+		this.context.refresh();
+		Dialect dialect = this.context.getBean(Dialect.class);
+		assertThat(dialect, is(instanceOf(PostgresDialect.class)));
 	}
 
 	@Test