DATAJDBC-257 - Adds DB2 support.

Db2Dialect added in order to support DB2.
Added test configuration files.
Adapted some tests to make them properly work with DB2
QueryAnnotationIntegrationTests converted into an Hsqldb only test since it is next to impossible to make it work across databases since it heavily depends on database and driver specifics.

Removed license acceptance file from the repository in order to not accept a license in the name of someone forking the repository.
For the CI build an appropriate file gets created on the fly.

Original pull request: #213.

Author: schauder

Jenkinsfile

@@ -29,6 +29,7 @@ pipeline {
 			}
 			options { timeout(time: 30, unit: 'MINUTES') }
 			steps {
+			    sh './accept-third-party-license.sh'
 				sh 'mkdir -p /tmp/jenkins-home'
 				sh 'chown -R 1001:1001 .'
 				sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs clean dependency:list test -Dsort -U -B'
@@ -55,6 +56,7 @@ pipeline {
 					}
 					options { timeout(time: 30, unit: 'MINUTES') }
 					steps {
+			    		sh './accept-third-party-license.sh'
 						sh 'mkdir -p /tmp/jenkins-home'
 						sh 'chown -R 1001:1001 .'
 						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs,java11 clean dependency:list test -Dsort -U -B'
@@ -73,7 +75,8 @@ pipeline {
 					}
 					options { timeout(time: 30, unit: 'MINUTES') }
 					steps {
-						sh 'mkdir -p /tmp/jenkins-home'
+				        sh './accept-third-party-license.sh'
+                		sh 'mkdir -p /tmp/jenkins-home'
 						sh 'chown -R 1001:1001 .'
 						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,all-dbs,java11 clean dependency:list test -Dsort -U -B'
 						sh 'chown -R 1001:1001 .'

accept-third-party-license.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+{
+  echo "mcr.microsoft.com/mssql/server:2017-CU12"
+  echo "ibmcom/db2:11.5.0.0a"
+} > spring-data-jdbc/src/test/resources/container-license-acceptance.txt

pom.xml

@@ -25,6 +25,7 @@
 
 		<degraph-check.version>0.1.4</degraph-check.version>
 
+		<db2.version>11.5.0.0</db2.version>
 		<h2.version>1.4.200</h2.version>
 		<hsqldb.version>2.2.8</hsqldb.version>
 		<mssql.version>7.0.0.jre8</mssql.version>
@@ -170,6 +171,24 @@
 									</systemPropertyVariables>
 								</configuration>
 							</execution>
+							<execution>
+								<id>db2-test</id>
+								<phase>test</phase>
+								<goals>
+									<goal>test</goal>
+								</goals>
+								<configuration>
+									<includes>
+										<include>**/*IntegrationTests.java</include>
+									</includes>
+									<excludes>
+										<exclude>**/*HsqlIntegrationTests.java</exclude>
+									</excludes>
+									<systemPropertyVariables>
+										<spring.profiles.active>db2</spring.profiles.active>
+									</systemPropertyVariables>
+								</configuration>
+							</execution>
 							<!--<execution>-->
 								<!--<id>mssql-test</id>-->
 								<!--<phase>test</phase>-->

spring-data-jdbc/pom.xml

@@ -186,6 +186,12 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>com.ibm.db2</groupId>
+			<artifactId>jcc</artifactId>
+			<version>11.1.4.4</version>
+		</dependency>
+
 		<dependency>
 			<groupId>de.schauderhaft.degraph</groupId>
 			<artifactId>degraph-check</artifactId>
@@ -223,6 +229,12 @@
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>db2</artifactId>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 </project>

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/config/DialectResolver.java

@@ -26,6 +26,7 @@
 
 import org.springframework.core.io.support.SpringFactoriesLoader;
 import org.springframework.dao.NonTransientDataAccessException;
+import org.springframework.data.relational.core.dialect.Db2Dialect;
 import org.springframework.data.relational.core.dialect.Dialect;
 import org.springframework.data.relational.core.dialect.H2Dialect;
 import org.springframework.data.relational.core.dialect.HsqlDbDialect;
@@ -123,7 +124,9 @@ private static Dialect getDialect(Connection connection) throws SQLException {
 			if (name.contains("microsoft")) {
 				return SqlServerDialect.INSTANCE;
 			}
-
+			if (name.contains("db2")) {
+				return Db2Dialect.INSTANCE;
+			}
 			return null;
 		}
 

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java

@@ -514,6 +514,7 @@ public void saveAndLoadAnEntityWithArray() {
 		assumeNot("mysql");
 		assumeNot("mariadb");
 		assumeNot("mssql");
+		assumeNot("db2");
 
 		ArrayOwner arrayOwner = new ArrayOwner();
 		arrayOwner.digits = new String[] { "one", "two", "three" };
@@ -539,6 +540,7 @@ public void saveAndLoadAnEntityWithMultidimensionalArray() {
 		assumeNot("mariadb");
 		assumeNot("mssql");
 		assumeNot("hsqldb");
+		assumeNot("db2");
 
 		ArrayOwner arrayOwner = new ArrayOwner();
 		arrayOwner.multidimensional = new String[][] { { "one-a", "two-a", "three-a" }, { "one-b", "two-b", "three-b" } };
@@ -563,6 +565,7 @@ public void saveAndLoadAnEntityWithList() {
 		assumeNot("mysql");
 		assumeNot("mariadb");
 		assumeNot("mssql");
+		assumeNot("db2");
 
 		ListOwner arrayOwner = new ListOwner();
 		arrayOwner.digits.addAll(Arrays.asList("one", "two", "three"));
@@ -586,6 +589,7 @@ public void saveAndLoadAnEntityWithSet() {
 		assumeNot("mysql");
 		assumeNot("mariadb");
 		assumeNot("mssql");
+		assumeNot("db2");
 
 		SetOwner setOwner = new SetOwner();
 		setOwner.digits.addAll(Arrays.asList("one", "two", "three"));

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationIntegrationTests.java renamed to spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/QueryAnnotationHsqlIntegrationTests.java

@@ -19,18 +19,16 @@
 
 import lombok.Value;
 
-import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import org.junit.Assume;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -42,7 +40,7 @@
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.lang.Nullable;
-import org.springframework.test.annotation.ProfileValueUtils;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.rules.SpringClassRule;
 import org.springframework.test.context.junit4.rules.SpringMethodRule;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,7 +53,8 @@
  * @author Mark Paluch
  */
 @Transactional
-public class QueryAnnotationIntegrationTests {
+@ActiveProfiles("hsql")
+public class QueryAnnotationHsqlIntegrationTests {
 
 	@Configuration
 	@Import(TestConfiguration.class)
@@ -64,7 +63,7 @@ static class Config {
 
 		@Bean
 		Class<?> testClass() {
-			return QueryAnnotationIntegrationTests.class;
+			return QueryAnnotationHsqlIntegrationTests.class;
 		}
 	}
 
@@ -76,8 +75,6 @@ Class<?> testClass() {
 	@Test // DATAJDBC-164
 	public void executeCustomQueryWithoutParameter() {
 
-		assumeNot("mysql");
-
 		repository.save(dummyEntity("Example"));
 		repository.save(dummyEntity("example"));
 		repository.save(dummyEntity("EXAMPLE"));
@@ -180,8 +177,6 @@ public void executeCustomQueryWithReturnTypeIsStream() {
 	@Test // DATAJDBC-175
 	public void executeCustomQueryWithReturnTypeIsNumber() {
 
-		assumeNot("mysql");
-
 		repository.save(dummyEntity("aaa"));
 		repository.save(dummyEntity("bbb"));
 		repository.save(dummyEntity("cac"));
@@ -194,40 +189,29 @@ public void executeCustomQueryWithReturnTypeIsNumber() {
 	@Test // DATAJDBC-175
 	public void executeCustomQueryWithReturnTypeIsBoolean() {
 
-		assumeNot("mysql");
-
 		repository.save(dummyEntity("aaa"));
 		repository.save(dummyEntity("bbb"));
 		repository.save(dummyEntity("cac"));
 
-		assertThat(repository.existsByNameContaining("a")).isTrue();
-		assertThat(repository.existsByNameContaining("d")).isFalse();
+		SoftAssertions.assertSoftly(softly -> {
+
+			softly.assertThat(repository.existsByNameContaining("a")).describedAs("entities with A in the name").isTrue();
+			softly.assertThat(repository.existsByNameContaining("d")).describedAs("entities with D in the name").isFalse();
+		});
 	}
 
 	@Test // DATAJDBC-175
 	public void executeCustomQueryWithReturnTypeIsDate() {
 
-		assumeNot("mysql");
-
-		// Since Timestamp extends Date the repository returns the Timestamp as it comes from the database.
-		// Trying to compare that to an actual Date results in non deterministic results, so we have to use an actual
-		// Timestamp.
-		Date now = new Timestamp(System.currentTimeMillis());
-		assertThat(repository.nowWithDate()).isAfterOrEqualsTo(now);
-
+		assertThat(repository.nowWithDate()).isInstanceOf(Date.class);
 	}
 
 	@Test // DATAJDBC-175
 	public void executeCustomQueryWithReturnTypeIsLocalDateTimeList() {
 
-		// mysql does not support plain VALUES(…)
-		assumeNot("mysql");
-
-		LocalDateTime preciseNow = LocalDateTime.now();
-		LocalDateTime truncatedNow = truncateSubmillis(preciseNow);
-
-		repository.nowWithLocalDateTimeList() //
-				.forEach(d -> assertThat(d).isAfterOrEqualTo(truncatedNow));
+		assertThat(repository.nowWithLocalDateTimeList()) //
+				.hasSize(2) //
+				.allSatisfy(d -> assertThat(d).isInstanceOf(LocalDateTime.class));
 	}
 
 	@Test // DATAJDBC-182
@@ -270,33 +254,16 @@ public void executeCustomModifyingQueryWithReturnTypeVoid() {
 	@Test // DATAJDBC-175
 	public void executeCustomQueryWithImmutableResultType() {
 
-		// mysql does not support plain VALUES(…)
-
-		assumeNot("mysql");
-
 		assertThat(repository.immutableTuple()).isEqualTo(new DummyEntityRepository.ImmutableTuple("one", "two", 3));
 	}
 
-	private static LocalDateTime truncateSubmillis(LocalDateTime now) {
-
-		int NANOS_IN_MILLIS = 1_000_000;
-		return now.withNano((now.getNano() / NANOS_IN_MILLIS) * 1_000_000);
-	}
-
 	private DummyEntity dummyEntity(String name) {
 
 		DummyEntity entity = new DummyEntity();
 		entity.name = name;
 		return entity;
 	}
 
-	private static void assumeNot(String dbProfileName) {
-
-		Assume.assumeTrue(
-				"true".equalsIgnoreCase(ProfileValueUtils.retrieveProfileValueSource(QueryAnnotationIntegrationTests.class)
-						.get("current.database.is.not." + dbProfileName)));
-	}
-
 	private static class DummyEntity {
 
 		@Id Long id;
@@ -327,11 +294,11 @@ private interface DummyEntityRepository extends CrudRepository<DummyEntity, Long
 		Stream<DummyEntity> findAllWithReturnTypeIsStream();
 
 		// DATAJDBC-175
-		@Query("SELECT count(*) FROM DUMMY_ENTITY WHERE name like '%' || :name || '%'")
+		@Query("SELECT count(*) FROM DUMMY_ENTITY WHERE name like concat('%', :name, '%')")
 		int countByNameContaining(@Param("name") String name);
 
 		// DATAJDBC-175
-		@Query("SELECT count(*) FROM DUMMY_ENTITY WHERE name like '%' || :name || '%'")
+		@Query("SELECT case when count(*) > 0 THEN 'true' ELSE 'false' END FROM DUMMY_ENTITY WHERE name like '%' || :name || '%'")
 		boolean existsByNameContaining(@Param("name") String name);
 
 		// DATAJDBC-175
@@ -358,7 +325,7 @@ private interface DummyEntityRepository extends CrudRepository<DummyEntity, Long
 		void insert(@Param("name") String name);
 
 		// DATAJDBC-252
-		@Query("SELECT 'one' one, 'two' two, 3 three FROM (VALUES (0))")
+		@Query("SELECT 'one' one, 'two' two, 3 three FROM (VALUES (0)) as tableName")
 		ImmutableTuple immutableTuple();
 
 		@Value

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/testing/Db2DataSourceConfiguration.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jdbc.testing;
+
+import javax.sql.DataSource;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
+import org.testcontainers.containers.Db2Container;
+
+/**
+ * {@link DataSource} setup for DB2.
+ *
+ * @author Jens Schauder
+ * @author Oliver Gierke
+ */
+@Configuration
+@Profile("db2")
+class Db2DataSourceConfiguration extends DataSourceConfiguration {
+
+	private static final Db2Container DB_2_CONTAINER = new Db2Container();
+
+	static {
+		DB_2_CONTAINER.start();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.jdbc.testing.DataSourceConfiguration#createDataSource()
+	 */
+	@Override
+	protected DataSource createDataSource() {
+
+		DriverManagerDataSource dataSource = new DriverManagerDataSource(DB_2_CONTAINER.getJdbcUrl(),
+				DB_2_CONTAINER.getUsername(), DB_2_CONTAINER.getPassword());
+
+		return dataSource;
+	}
+
+	@Override
+	protected void customizePopulator(ResourceDatabasePopulator populator) {
+		populator.setIgnoreFailedDrops(true);
+	}
+}