HHH-18535 - Support jakarta.persistence.EntityResult#lockMode

Author: sebersole

hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java

@@ -46,6 +46,7 @@
 import jakarta.persistence.ConstructorResult;
 import jakarta.persistence.EntityResult;
 import jakarta.persistence.FieldResult;
+import jakarta.persistence.LockModeType;
 import jakarta.persistence.SqlResultSetMapping;
 
 import static org.hibernate.internal.util.collections.CollectionHelper.arrayList;
@@ -231,6 +232,7 @@ public static class EntityResultDescriptor implements ResultDescriptor {
 		private final NavigablePath navigablePath;
 		private final String entityName;
 		private final String discriminatorColumn;
+		private final LockModeType lockMode;
 
 		private final Map<String, AttributeFetchDescriptor> explicitFetchMappings;
 
@@ -239,6 +241,7 @@ public EntityResultDescriptor(EntityResult entityResult) {
 			this.navigablePath = new NavigablePath( entityName );
 
 			this.discriminatorColumn = entityResult.discriminatorColumn();
+			this.lockMode = entityResult.lockMode();
 
 			this.explicitFetchMappings = extractFetchMappings( navigablePath, entityResult );
 		}
@@ -288,7 +291,9 @@ public ResultMemento resolve(ResultSetMappingResolutionContext resolutionContext
 
 			return new ResultMementoEntityJpa(
 					entityDescriptor,
-					LockMode.READ,
+					lockMode == LockModeType.OPTIMISTIC
+							? LockMode.NONE
+							: LockMode.fromJpaLockMode( lockMode ),
 					discriminatorMemento,
 					fetchMementos
 			);

hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityJpa.java

@@ -21,6 +21,7 @@
 import org.hibernate.query.results.ResultsHelper;
 import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.spi.NavigablePath;
+import org.hibernate.sql.ast.spi.SqlAliasBase;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.entity.EntityResult;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
@@ -90,6 +91,9 @@ public EntityResult buildResult(
 			int resultPosition,
 			BiFunction<String, String, DynamicFetchBuilderLegacy> legacyFetchResolver,
 			DomainResultCreationState domainResultCreationState) {
+		final String implicitAlias = entityDescriptor.getSqlAliasStem() + resultPosition;
+		final SqlAliasBase sqlAliasBase = domainResultCreationState.getSqlAliasBaseManager().createSqlAliasBase( implicitAlias );
+
 		final DomainResultCreationStateImpl impl = ResultsHelper.impl( domainResultCreationState );
 		impl.disallowPositionalSelections();
 
@@ -103,8 +107,8 @@ public EntityResult buildResult(
 							// since this is only used for result set mappings, the canUseInnerJoins value is irrelevant.
 							true,
 							navigablePath,
-							null,
-							null,
+							implicitAlias,
+							sqlAliasBase,
 							null,
 							impl.getSqlAstCreationState()
 					)
@@ -113,7 +117,7 @@ public EntityResult buildResult(
 			return new EntityResultImpl(
 					navigablePath,
 					entityDescriptor,
-					null,
+					implicitAlias,
 					lockMode,
 					(entityResult) -> {
 						if ( discriminatorFetchBuilder == null ) {

hibernate-core/src/test/java/org/hibernate/orm/test/query/resultmapping/EntityResultTests.java

@@ -19,12 +19,14 @@
 
 import jakarta.persistence.LockModeType;
 import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.dialect.H2Dialect;
 import org.hibernate.query.named.NamedResultSetMappingMemento;
 
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.FailureExpected;
 import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
@@ -123,8 +125,10 @@ public void testImplicitAttributeMapping(SessionFactoryScope scope) {
 	}
 
 	@Test
-	@FailureExpected( jiraKey = "HHH-18535", reason = "Support for @EntityResult(lockMode) not implemented yet")
-	@Jira( "https://hibernate.atlassian.net/browse/HHH-18535" )
+	@RequiresDialect(
+			value = H2Dialect.class,
+			comment = "We don't really care about the execution on the database, just how the result-set is handled.  Some databases (mssql) don't like this query"
+	)
 	public void testImplicitAttributeMappingWithLockMode(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {