DATAJDBC-256 - Run integration tests with Oracle.

An Oracle database is started in Docker using Testcontainers. Tests that don't work yet are skipped using the TestDatabaseFeatures which allows central control, which database supports which feature. A suitable oracle image is deployed on DockerHub as "springci/spring-data-oracle-xe-prebuild:18.4.0". The official Oracle docker images as described here https://github.com/oracle/docker-images/blob/master/OracleDatabase/SingleInstance/README.md are not suitable since it needs about 15min to start and also TestContainers seems to break it by trying to us it to early. The referenced image was created based on these instructions: https://github.com/oracle/docker-images/tree/master/OracleDatabase/SingleInstance/samples/prebuiltdb The following features don't yet work for Oracle: * Loading of date like properties. * Ids with custom names. * Array support. * Boolean properties. * BigDecimals and BigInteger is limited to what fits into Oracles NUMBER data type. * Entities that use a join during load time, i.e. with a one to one relationship. Original pull request: spring-projects#232.

Author: schauder

pom.xml

@@ -204,7 +204,7 @@
 <exclude>**/*HsqlIntegrationTests.java</exclude>
 </excludes>
 <systemPropertyVariables>
-<spring.profiles.active>orcacle</spring.profiles.active>
+<spring.profiles.active>oracle</spring.profiles.active>
 </systemPropertyVariables>
 </configuration>
 </execution>

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutionContext.java

@@ -72,6 +72,7 @@ class JdbcAggregateChangeExecutionContext {
 }
 
 <T> void executeInsertRoot(DbAction.InsertRoot<T> insert) {
+
 RelationalPersistentEntity<T> persistentEntity = getRequiredPersistentEntity(insert.getEntityType());
 
 Object id;

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java

@@ -37,7 +37,7 @@
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.mapping.PropertyHandler;
-import org.springframework.data.relational.core.dialect.LockClause;
+import org.springframework.data.relational.core.dialect.IdGeneration;
 import org.springframework.data.relational.core.mapping.PersistentPropertyPathExtension;
 import org.springframework.data.relational.core.mapping.RelationalMappingContext;
 import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
@@ -122,11 +122,20 @@ public <T> Object insert(T instance, Class<T> domainType, Identifier identifier)
 
 KeyHolder holder = new GeneratedKeyHolder();
 
-operations.update( //
-sqlGenerator.getInsert(new HashSet<>(parameterSource.getIdentifiers())), //
-parameterSource, //
-holder //
-);
+IdGeneration idGeneration = sqlGeneratorSource.getDialect().getIdGeneration();
+String insertSql = sqlGenerator.getInsert(new HashSet<>(parameterSource.getIdentifiers()));
+
+if (idGeneration.driverRequiresKeyColumnNames()) {
+
+String[] keyColumnNames = getKeyColumnNames(domainType);
+if (keyColumnNames.length == 0) {
+operations.update(insertSql, parameterSource, holder);
+} else {
+operations.update(insertSql, parameterSource, holder, keyColumnNames);
+}
+} else {
+operations.update(insertSql, parameterSource, holder);
+}
 
 return getIdFromHolder(holder, persistentEntity);
 }
@@ -567,6 +576,19 @@ private SqlGenerator sql(Class<?> domainType) {
 return sqlGeneratorSource.getSqlGenerator(domainType);
 }
 
+private <T> String[] getKeyColumnNames(Class<T> domainType) {
+
+RelationalPersistentEntity<?> requiredPersistentEntity = context.getRequiredPersistentEntity(domainType);
+
+if (!requiredPersistentEntity.hasIdProperty()) {
+return new String[0];
+}
+
+SqlIdentifier idColumn = requiredPersistentEntity.getIdColumn();
+
+return new String[] { idColumn.getReference(getIdentifierProcessing()) };
+}
+
 /**
  * Utility to create {@link Predicate}s.
  */

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

@@ -33,6 +33,7 @@
 import org.springframework.data.relational.core.dialect.H2Dialect;
 import org.springframework.data.relational.core.dialect.HsqlDbDialect;
 import org.springframework.data.relational.core.dialect.MySqlDialect;
+import org.springframework.data.relational.core.dialect.OracleDialect;
 import org.springframework.data.relational.core.dialect.PostgresDialect;
 import org.springframework.data.relational.core.dialect.SqlServerDialect;
 import org.springframework.data.relational.core.sql.IdentifierProcessing;
@@ -131,6 +132,9 @@ private static Dialect getDialect(Connection connection) throws SQLException {
 if (name.contains("db2")) {
 return Db2Dialect.INSTANCE;
 }
+if (name.contains("oracle")) {
+return OracleDialect.INSTANCE;
+}
 
 LOG.info(String.format("Couldn't determine Dialect for \"%s\"", name) );
 return null;