HHH-19261 - query hints in Oracle are not concatenated with comma's, but with spaces

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/OracleLegacyDialect.java

@@ -13,6 +13,7 @@
 import java.sql.Types;
 import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalAccessor;
+import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 import java.util.regex.Matcher;
@@ -109,7 +110,9 @@
 
 import jakarta.persistence.TemporalType;
 
+import static java.lang.String.join;
 import static org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor.extractUsingTemplate;
+import static org.hibernate.internal.util.StringHelper.isEmpty;
 import static org.hibernate.query.sqm.TemporalUnit.DAY;
 import static org.hibernate.query.sqm.TemporalUnit.HOUR;
 import static org.hibernate.query.sqm.TemporalUnit.MINUTE;
@@ -1109,6 +1112,17 @@ public boolean useFollowOnLocking(String sql, QueryOptions queryOptions) {
 				);
 	}
 
+	@Override
+	public String getQueryHintString(String query, List<String> hintList) {
+		if ( hintList.isEmpty() ) {
+			return query;
+		}
+		else {
+			final String hints = join( " ", hintList );
+			return isEmpty( hints ) ? query : getQueryHintString( query, hints );
+		}
+	}
+
 	@Override
 	public String getQueryHintString(String sql, String hints) {
 		final String statementType = statementType( sql );

hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java

@@ -13,6 +13,7 @@
 import java.sql.Types;
 import java.time.temporal.ChronoField;
 import java.time.temporal.TemporalAccessor;
+import java.util.List;
 import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -81,7 +82,6 @@
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.hibernate.type.descriptor.jdbc.AggregateJdbcType;
-import org.hibernate.type.descriptor.jdbc.ArrayJdbcType;
 import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.NullJdbcType;
@@ -94,6 +94,7 @@
 
 import jakarta.persistence.TemporalType;
 
+import static java.lang.String.join;
 import static java.util.regex.Pattern.CASE_INSENSITIVE;
 import static org.hibernate.LockOptions.NO_WAIT;
 import static org.hibernate.LockOptions.SKIP_LOCKED;
@@ -1119,6 +1120,17 @@ public boolean useFollowOnLocking(String sql, QueryOptions queryOptions) {
 			|| queryOptions.hasLimit() && queryOptions.getLimit().getFirstRow() != null;
 	}
 
+	@Override
+	public String getQueryHintString(String query, List<String> hintList) {
+		if ( hintList.isEmpty() ) {
+			return query;
+		}
+		else {
+			final String hints = join( " ", hintList );
+			return isEmpty( hints ) ? query : getQueryHintString( query, hints );
+		}
+	}
+
 	@Override
 	public String getQueryHintString(String sql, String hints) {
 		final String statementType = statementType( sql );

hibernate-core/src/test/java/org/hibernate/orm/test/queryhint/OracleQueryHintTest.java

@@ -96,7 +96,7 @@ public void testQueryHint(SessionFactoryScope scope) {
 		} );
 
 		statementInspector.assertExecutedCount( 1 );
-		assertTrue( statementInspector.getSqlQueries().get( 0 ).contains( "select /*+ ALL_ROWS, USE_CONCAT */" ) );
+		assertTrue( statementInspector.getSqlQueries().get( 0 ).contains( "select /*+ ALL_ROWS USE_CONCAT */" ) );
 		statementInspector.clear();
 
 		// ensure the insertion logic can handle a comment appended to the front