HHH-19602 - Adjust JdbcOperation to allow more-than-one statement

hibernate-core/src/main/java/org/hibernate/dialect/function/NumberSeriesGenerateSeriesFunction.java

@@ -48,7 +48,7 @@
 import org.hibernate.sql.ast.tree.predicate.PredicateContainer;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
-import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.results.internal.SqlSelectionImpl;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.SqlTypes;

hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/OracleLockingSupport.java

@@ -61,7 +61,9 @@ public RowLockStrategy getWriteRowLockStrategy() {
 
 	@Override
 	public OuterJoinLockingType getOuterJoinLockingType() {
-		return OuterJoinLockingType.UNSUPPORTED;
+		// Per Loic, as of 23 at least, Oracle does support this.
+		// Let's see what CI says for previous supported versions.
+		return OuterJoinLockingType.IDENTIFIED;
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/dialect/lock/internal/SqlAstBasedLockingStrategy.java

@@ -34,7 +34,7 @@
 import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.internal.JdbcParameterImpl;
-import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcSelectExecutor;
 import org.hibernate.sql.results.graph.basic.BasicResult;

hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/OracleSqlAstTranslator.java

@@ -190,7 +190,9 @@ else if ( followOnStrategy == Locking.FollowOn.IGNORE ) {
 			}
 		}
 
-		if ( strategy != LockStrategy.FOLLOW_ON && needsLockingWrapper( querySpec ) && !canApplyLockingWrapper( querySpec ) ) {
+		if ( strategy != LockStrategy.FOLLOW_ON
+				&& needsLockingWrapper( querySpec, followOnStrategy )
+				&& !canApplyLockingWrapper( querySpec ) ) {
 			if ( followOnStrategy == Locking.FollowOn.DISALLOW ) {
 				throw new IllegalQueryOperationException( "Locking with OFFSET/FETCH is not supported" );
 			}
@@ -317,7 +319,11 @@ public void visitQueryGroup(QueryGroup queryGroup) {
 
 	@Override
 	public void visitQuerySpec(QuerySpec querySpec) {
-		final EntityIdentifierMapping identifierMappingForLockingWrapper = identifierMappingForLockingWrapper( querySpec );
+		final LockOptions lockOptions = getLockOptions();
+		final Locking.FollowOn followOnStrategy = lockOptions == null
+				? Locking.FollowOn.ALLOW
+				: lockOptions.getFollowOnStrategy();
+		final EntityIdentifierMapping identifierMappingForLockingWrapper = identifierMappingForLockingWrapper( querySpec, followOnStrategy );
 		final Expression offsetExpression;
 		final Expression fetchExpression;
 		final FetchClauseType fetchClauseType;
@@ -423,13 +429,13 @@ private QuerySpec createLockingWrapper(
 		return lockingWrapper;
 	}
 
-	private EntityIdentifierMapping identifierMappingForLockingWrapper(QuerySpec querySpec) {
+	private EntityIdentifierMapping identifierMappingForLockingWrapper(QuerySpec querySpec, Locking.FollowOn followOnStrategy) {
 		// We only need a locking wrapper for very simple queries
 		if ( canApplyLockingWrapper( querySpec )
 				// There must be the need for locking in this query
 				&& needsLocking( querySpec )
 				// The query uses some sort of pagination which makes the wrapper necessary
-				&& needsLockingWrapper( querySpec )
+				&& needsLockingWrapper( querySpec, followOnStrategy )
 				// The query may not have a group by, having and distinct clause, or use aggregate functions,
 				// as these features will force the use of follow-on locking
 				&& querySpec.getGroupByClauseExpressions().isEmpty()
@@ -450,9 +456,8 @@ private boolean canApplyLockingWrapper(QuerySpec querySpec) {
 				&& fromClause.getRoots().get( 0 ).getModelPart() instanceof EntityMappingType;
 	}
 
-	private boolean needsLockingWrapper(QuerySpec querySpec) {
-		final LockOptions lockOptions = getLockOptions();
-		if ( lockOptions.getFollowOnStrategy() == Locking.FollowOn.FORCE ) {
+	private boolean needsLockingWrapper(QuerySpec querySpec, Locking.FollowOn followOnStrategy) {
+		if ( followOnStrategy == Locking.FollowOn.FORCE ) {
 			// user explicitly asked for follow-on locking
 			return false;
 		}

hibernate-core/src/main/java/org/hibernate/engine/jdbc/spi/JdbcServices.java

@@ -17,7 +17,7 @@
 import org.hibernate.sql.exec.internal.StandardJdbcMutationExecutor;
 import org.hibernate.sql.exec.spi.JdbcMutationExecutor;
 import org.hibernate.sql.exec.spi.JdbcOperationQueryMutation;
-import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcSelectExecutor;
 
 /**

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java

@@ -4,15 +4,6 @@
  */
 package org.hibernate.engine.spi;
 
-import java.sql.Connection;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import javax.naming.NamingException;
-import javax.naming.Reference;
 import jakarta.persistence.EntityGraph;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceUnitTransactionType;
@@ -21,7 +12,6 @@
 import jakarta.persistence.SynchronizationType;
 import jakarta.persistence.TypedQuery;
 import jakarta.persistence.TypedQueryReference;
-
 import org.hibernate.CustomEntityDirtinessStrategy;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
@@ -37,12 +27,12 @@
 import org.hibernate.engine.creation.spi.SessionBuilderImplementor;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.profile.FetchProfile;
+import org.hibernate.event.service.spi.EventListenerGroups;
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.EntityCopyObserverFactory;
 import org.hibernate.event.spi.EventEngine;
-import org.hibernate.graph.RootGraph;
+import org.hibernate.generator.Generator;
 import org.hibernate.graph.spi.RootGraphImplementor;
-import org.hibernate.event.service.spi.EventListenerGroups;
 import org.hibernate.metamodel.MappingMetamodel;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.metamodel.spi.RuntimeMetamodelsImplementor;
@@ -56,11 +46,20 @@
 import org.hibernate.sql.ast.spi.ParameterMarkerStrategy;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducerProvider;
 import org.hibernate.stat.spi.StatisticsImplementor;
-import org.hibernate.generator.Generator;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
 
+import javax.naming.NamingException;
+import javax.naming.Reference;
+import java.sql.Connection;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
 /**
  * Base delegating implementation of the {@link SessionFactory} and
  * {@link SessionFactoryImplementor} contracts for intended for easier
@@ -230,7 +229,7 @@ public SqlStringGenerationContext getSqlStringGenerationContext() {
 	}
 
 	@Override
-	public RootGraph<Map<String, ?>> createGraphForDynamicEntity(String entityName) {
+	public RootGraphImplementor<Map<String, ?>> createGraphForDynamicEntity(String entityName) {
 		return delegate.createGraphForDynamicEntity( entityName );
 	}
 

hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java

@@ -23,7 +23,6 @@
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.EntityCopyObserverFactory;
 import org.hibernate.event.spi.EventEngine;
-import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.event.service.spi.EventListenerGroups;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
@@ -309,7 +308,7 @@ default <T> RootGraphImplementor<T> createEntityGraph(Class<T> entityType) {
 	}
 
 	@Override
-	RootGraph<Map<String, ?>> createGraphForDynamicEntity(String entityName);
+	RootGraphImplementor<Map<String, ?>> createGraphForDynamicEntity(String entityName);
 
 	/**
 	 * The best guess entity name for an entity not in an association

hibernate-core/src/main/java/org/hibernate/internal/AbstractScrollableResults.java

@@ -7,10 +7,10 @@
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.query.spi.ScrollableResultsImplementor;
-import org.hibernate.sql.results.jdbc.internal.JdbcValuesSourceProcessingStateStandardImpl;
 import org.hibernate.sql.results.internal.RowProcessingStateStandardImpl;
 import org.hibernate.sql.results.jdbc.spi.JdbcValues;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions;
+import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState;
 import org.hibernate.sql.results.spi.RowReader;
 
 /**
@@ -22,7 +22,7 @@
 public abstract class AbstractScrollableResults<R> implements ScrollableResultsImplementor<R> {
 	private final JdbcValues jdbcValues;
 	private final JdbcValuesSourceProcessingOptions processingOptions;
-	private final JdbcValuesSourceProcessingStateStandardImpl jdbcValuesSourceProcessingState;
+	private final JdbcValuesSourceProcessingState jdbcValuesSourceProcessingState;
 	private final RowProcessingStateStandardImpl rowProcessingState;
 	private final RowReader<R> rowReader;
 	private final SharedSessionContractImplementor persistenceContext;
@@ -32,7 +32,7 @@ public abstract class AbstractScrollableResults<R> implements ScrollableResultsI
 	public AbstractScrollableResults(
 			JdbcValues jdbcValues,
 			JdbcValuesSourceProcessingOptions processingOptions,
-			JdbcValuesSourceProcessingStateStandardImpl jdbcValuesSourceProcessingState,
+			JdbcValuesSourceProcessingState jdbcValuesSourceProcessingState,
 			RowProcessingStateStandardImpl rowProcessingState,
 			RowReader<R> rowReader,
 			SharedSessionContractImplementor persistenceContext) {
@@ -62,7 +62,7 @@ protected JdbcValuesSourceProcessingOptions getProcessingOptions() {
 		return processingOptions;
 	}
 
-	protected JdbcValuesSourceProcessingStateStandardImpl getJdbcValuesSourceProcessingState() {
+	protected JdbcValuesSourceProcessingState getJdbcValuesSourceProcessingState() {
 		return jdbcValuesSourceProcessingState;
 	}
 

hibernate-core/src/main/java/org/hibernate/internal/FetchingScrollableResultsImpl.java

@@ -9,9 +9,9 @@
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.sql.results.internal.RowProcessingStateStandardImpl;
-import org.hibernate.sql.results.jdbc.internal.JdbcValuesSourceProcessingStateStandardImpl;
 import org.hibernate.sql.results.jdbc.spi.JdbcValues;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions;
+import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState;
 import org.hibernate.sql.results.spi.LoadContexts;
 import org.hibernate.sql.results.spi.RowReader;
 
@@ -31,7 +31,7 @@ public class FetchingScrollableResultsImpl<R> extends AbstractScrollableResults<
 	public FetchingScrollableResultsImpl(
 			JdbcValues jdbcValues,
 			JdbcValuesSourceProcessingOptions processingOptions,
-			JdbcValuesSourceProcessingStateStandardImpl jdbcValuesSourceProcessingState,
+			JdbcValuesSourceProcessingState jdbcValuesSourceProcessingState,
 			RowProcessingStateStandardImpl rowProcessingState,
 			RowReader<R> rowReader,
 			SharedSessionContractImplementor persistenceContext) {

hibernate-core/src/main/java/org/hibernate/internal/ScrollableResultsImpl.java

@@ -7,9 +7,9 @@
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.sql.results.internal.RowProcessingStateStandardImpl;
-import org.hibernate.sql.results.jdbc.internal.JdbcValuesSourceProcessingStateStandardImpl;
 import org.hibernate.sql.results.jdbc.spi.JdbcValues;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions;
+import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingState;
 import org.hibernate.sql.results.spi.LoadContexts;
 import org.hibernate.sql.results.spi.RowReader;
 
@@ -24,7 +24,7 @@ public class ScrollableResultsImpl<R> extends AbstractScrollableResults<R> {
 	public ScrollableResultsImpl(
 			JdbcValues jdbcValues,
 			JdbcValuesSourceProcessingOptions processingOptions,
-			JdbcValuesSourceProcessingStateStandardImpl jdbcValuesSourceProcessingState,
+			JdbcValuesSourceProcessingState jdbcValuesSourceProcessingState,
 			RowProcessingStateStandardImpl rowProcessingState,
 			RowReader<R> rowReader,
 			SharedSessionContractImplementor persistenceContext) {

hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java

@@ -4,26 +4,15 @@
  */
 package org.hibernate.internal;
 
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serial;
-import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import javax.naming.Reference;
-import javax.naming.StringRefAddr;
-
+import jakarta.persistence.EntityGraph;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.PersistenceUnitTransactionType;
+import jakarta.persistence.PersistenceUnitUtil;
+import jakarta.persistence.Query;
+import jakarta.persistence.SynchronizationType;
 import jakarta.persistence.TypedQuery;
+import jakarta.persistence.TypedQueryReference;
 import org.hibernate.CustomEntityDirtinessStrategy;
 import org.hibernate.EntityNameResolver;
 import org.hibernate.FlushMode;
@@ -67,12 +56,11 @@
 import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform;
 import org.hibernate.event.monitor.internal.EmptyEventMonitor;
 import org.hibernate.event.monitor.spi.EventMonitor;
+import org.hibernate.event.service.spi.EventListenerGroups;
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.EntityCopyObserverFactory;
 import org.hibernate.event.spi.EventEngine;
-import org.hibernate.event.service.spi.EventListenerGroups;
 import org.hibernate.generator.Generator;
-import org.hibernate.graph.RootGraph;
 import org.hibernate.graph.internal.RootGraphImpl;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.integrator.spi.Integrator;
@@ -113,14 +101,24 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import jakarta.persistence.EntityGraph;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceException;
-import jakarta.persistence.PersistenceUnitTransactionType;
-import jakarta.persistence.PersistenceUnitUtil;
-import jakarta.persistence.Query;
-import jakarta.persistence.SynchronizationType;
-import jakarta.persistence.TypedQueryReference;
+import javax.naming.Reference;
+import javax.naming.StringRefAddr;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serial;
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+import java.util.function.Function;
 
 import static jakarta.persistence.SynchronizationType.SYNCHRONIZED;
 import static java.util.Collections.emptySet;
@@ -719,7 +717,7 @@ public boolean isOpen() {
 	}
 
 	@Override
-	public RootGraph<Map<String, ?>> createGraphForDynamicEntity(String entityName) {
+	public RootGraphImplementor<Map<String, ?>> createGraphForDynamicEntity(String entityName) {
 		final var entity = getJpaMetamodel().entity( entityName );
 		if ( entity.getRepresentationMode() != RepresentationMode.MAP ) {
 			throw new IllegalArgumentException( "Entity '" + entityName + "' is not a dynamic entity" );

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractNaturalIdLoader.java

@@ -43,7 +43,7 @@
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.internal.JdbcParameterImpl;
 import org.hibernate.sql.exec.spi.Callback;
-import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBinding;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderArrayParam.java

@@ -26,7 +26,7 @@
 import org.hibernate.sql.exec.internal.JdbcParameterBindingImpl;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
 import org.hibernate.sql.exec.internal.JdbcParameterImpl;
-import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionBatchLoaderInPredicate.java

@@ -17,7 +17,7 @@
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.select.SelectStatement;
-import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
 

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionElementLoaderByIndex.java

@@ -25,7 +25,7 @@
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.BaseExecutionContext;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
-import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;

hibernate-core/src/main/java/org/hibernate/loader/ast/internal/CollectionLoaderSingleKey.java

@@ -22,7 +22,7 @@
 import org.hibernate.sql.ast.tree.select.SelectStatement;
 import org.hibernate.sql.exec.internal.BaseExecutionContext;
 import org.hibernate.sql.exec.internal.JdbcParameterBindingsImpl;
-import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
+import org.hibernate.sql.exec.internal.JdbcOperationQuerySelect;
 import org.hibernate.sql.exec.spi.JdbcParameterBindings;
 import org.hibernate.sql.exec.spi.JdbcParametersList;
 import org.hibernate.sql.results.internal.RowTransformerStandardImpl;