From 76df41f9bef6991e916b5c6392063bdf906555a1 Mon Sep 17 00:00:00 2001
From: Jan Schatteman <jschatte@redhat.com>
Date: Thu, 29 Aug 2024 22:34:27 +0200
Subject: [PATCH] HHH-18537 - Support Session#createNamedSelectionQuery for
 native-query

Signed-off-by: Jan Schatteman <jschatte@redhat.com>
---
 .../internal/AbstractSharedSessionContract.java          | 9 +--------
 .../jpa/query/NamedNativeQueryWithResultMappingTest.java | 1 -
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
index 265cd2c674..edf4df1724 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
@@ -1065,14 +1065,7 @@ public abstract class AbstractSharedSessionContract implements SharedSessionCont
 	private <R> SelectionQuery<R> createNamedNativeSelectionQuery(
 			NamedNativeQueryMemento memento,
 			Class<R> expectedResultType) {
-		throw new UnsupportedOperationException(
-				String.format(
-						Locale.ROOT,
-						"Support for `@%s` + `%s` is not (yet) implemented",
-						NamedNativeQuery.class.getName(),
-						SelectionQuery.class.getName()
-				)
-		);
+		return memento.toQuery( this, expectedResultType );
 	}
 
 	private <R> SqmSelectionQuery<R> createNamedSqmSelectionQuery(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedNativeQueryWithResultMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedNativeQueryWithResultMappingTest.java
index 700803d455..b64648caa0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedNativeQueryWithResultMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NamedNativeQueryWithResultMappingTest.java
@@ -17,7 +17,6 @@ import org.junit.jupiter.api.Test;
 
 @SessionFactory
 @DomainModel(annotatedClasses = NamedNativeQueryWithResultMappingTest.Mapped.class)
-@FailureExpected( jiraKey = "HHH-18537", reason = "Call to #createNamedSelectionQuery for native-query, which never worked." )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-18537" )
 public class NamedNativeQueryWithResultMappingTest {
 	@Test void test(SessionFactoryScope scope) {