[#1532] change to Oracle12cDialect, fix oracle test container datatypes and oracle createInsert() sql

Author: blafond

hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/insert/ReactiveAbstractReturningDelegate.java

@@ -12,6 +12,7 @@
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.Oracle12cDialect;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
@@ -98,6 +99,24 @@ private static String createInsert(PreparedStatementDetails insertStatementDetai
 			// Correct  : select id from new table ( insert into LongTypeEntity (id) values (default))
 			return insertStatementDetails.getSqlString().replace( " values ( ))", " (" + identifierColumnName + ") values (default))" );
 		}
+		if( dialect instanceof Oracle12cDialect ) {
+			final String valuesStr = " values ( )";
+			String sql = insertStatementDetails.getSqlString();
+			int index = sql.lastIndexOf( sqlEnd );
+			// remove "returning id" since it's added via
+			if ( index > -1 ) {
+				sql = sql.substring( 0, index );
+			}
+
+			// Oracle is expecting values (default)
+			if ( sql.endsWith( valuesStr ) ) {
+				index = sql.lastIndexOf( valuesStr );
+				sql = sql.substring( 0, index );
+				sql = sql + " values (default)";
+			}
+
+			return sql;
+		}
 		return insertStatementDetails.getSqlString();
 	}
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/provider/service/NoJdbcEnvironmentInitiator.java

@@ -16,7 +16,7 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.MariaDBDialect;
 import org.hibernate.dialect.MySQLDialect;
-import org.hibernate.dialect.OracleDialect;
+import org.hibernate.dialect.Oracle12cDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
@@ -144,7 +144,7 @@ protected Class<? extends Dialect> guessDialect(String url) {
 			return SQLServerDialect.class;
 		}
 		if ( url.startsWith( "oracle:" ) ) {
-			return OracleDialect.class;
+			return Oracle12cDialect.class;
 		}
 
 		return null;

hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/OracleDatabase.java

@@ -22,6 +22,11 @@
 import java.util.TimeZone;
 import java.util.UUID;
 
+
+import org.hibernate.type.NumericBooleanConverter;
+import org.hibernate.type.TrueFalseConverter;
+import org.hibernate.type.YesNoConverter;
+
 import org.testcontainers.containers.OracleContainer;
 
 import static org.hibernate.reactive.containers.DockerImage.imageName;
@@ -43,10 +48,10 @@ class OracleDatabase implements TestableDatabase {
 			expectedDBTypeForClass.put( Boolean.class, "NUMBER" );
 
 			// FIXME: [ORM-6] Check if we need alternatives
-			// expectedDBTypeForClass.put( NumericBooleanType.class, "NUMBER" );
-			// expectedDBTypeForClass.put( TrueFalseType.class, "CHAR" );
-			// expectedDBTypeForClass.put( YesNoType.class, "CHAR" );
-			// expectedDBTypeForClass.put( PrimitiveByteArrayTypeDescriptor.class, "BLOB" );
+			expectedDBTypeForClass.put( NumericBooleanConverter.class, "NUMBER" );
+			expectedDBTypeForClass.put( YesNoConverter.class, "CHAR" );
+			expectedDBTypeForClass.put( TrueFalseConverter.class, "CHAR" );
+			expectedDBTypeForClass.put( byte[].class, "RAW" );
 			// expectedDBTypeForClass.put( TextType.class, "VARCHAR2" );
 
 			expectedDBTypeForClass.put( int.class, "NUMBER" );
@@ -63,9 +68,9 @@ class OracleDatabase implements TestableDatabase {
 			expectedDBTypeForClass.put( TimeZone.class, "VARCHAR2" );
 			expectedDBTypeForClass.put( Date.class, "DATE" );
 			expectedDBTypeForClass.put( Timestamp.class, "TIMESTAMP(6)" );
-			expectedDBTypeForClass.put( Time.class, "DATE" );
+			expectedDBTypeForClass.put( Time.class, "TIMESTAMP(6)" );
 			expectedDBTypeForClass.put( LocalDate.class, "DATE" );
-			expectedDBTypeForClass.put( LocalTime.class, "TIMESTAMP(6)" );
+			expectedDBTypeForClass.put( LocalTime.class, "DATE" );
 			expectedDBTypeForClass.put( LocalDateTime.class, "TIMESTAMP(6)" );
 			expectedDBTypeForClass.put( BigInteger.class, "NUMBER" );
 			expectedDBTypeForClass.put( BigDecimal.class, "NUMBER" );