HHH-18629 Add tests for issue

Author: quaff

hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java

@@ -18,6 +18,7 @@
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
+import org.hibernate.testing.orm.domain.gambit.BasicEntity;
 import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
 import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter;
 import org.hibernate.query.sql.spi.NativeQueryImplementor;
@@ -26,6 +27,7 @@
 import org.hibernate.testing.orm.domain.StandardDomainModel;
 import org.hibernate.testing.orm.domain.gambit.EntityOfBasics;
 import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.AfterEach;
@@ -277,6 +279,45 @@ public void testConvertedAttributeBasedBuilder(SessionFactoryScope scope) {
 		);
 	}
 
+	@Test
+	@JiraKey("HHH-18629")
+	public void testNativeQueryWithResultClass(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					final String sql = "select data, id from BasicEntity";
+					final NativeQueryImplementor<?> query = session.createNativeQuery( sql, BasicEntity.class );
+
+					final List<?> results = query.list();
+					assertThat( results.size(), is( 1 ) );
+
+					final BasicEntity result = (BasicEntity) results.get( 0 );
+
+					assertThat( result.getData(), is( STRING_VALUE ) );
+					assertThat( result.getId(), is( 1 ) );
+				}
+		);
+	}
+
+	@Test
+	@JiraKey("HHH-18629")
+	public void testNativeQueryWithResultClassAndPlaceholders(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					final String sql = "select {be.*} from BasicEntity be";
+					final NativeQueryImplementor<?> query = session.createNativeQuery( sql, BasicEntity.class );
+					query.addEntity( "be", BasicEntity.class );
+
+					final List<?> results = query.list();
+					assertThat( results.size(), is( 1 ) );
+
+					final BasicEntity result = (BasicEntity) results.get( 0 );
+
+					assertThat( result.getData(), is( STRING_VALUE ) );
+					assertThat( result.getId(), is( 1 ) );
+				}
+		);
+	}
+
 	@BeforeAll
 	public void verifyModel(SessionFactoryScope scope) {
 		final EntityMappingType entityDescriptor = scope.getSessionFactory()
@@ -315,21 +356,27 @@ public void prepareData(SessionFactoryScope scope) throws MalformedURLException
 					entityOfBasics.setTheInstant( Instant.EPOCH );
 
 					session.persist( entityOfBasics );
+
+					session.persist( new BasicEntity( 1, STRING_VALUE ) );
 				}
 		);
 
 		scope.inTransaction(
 				session -> {
-					final EntityOfBasics entity = session.get( EntityOfBasics.class, 1 );
-					assertThat( entity, notNullValue() );
+					assertThat( session.get( EntityOfBasics.class, 1 ), notNullValue() );
+
+					assertThat( session.get( BasicEntity.class, 1 ), notNullValue() );
 				}
 		);
 	}
 
 	@AfterEach
 	public void cleanUpData(SessionFactoryScope scope) {
 		scope.inTransaction(
-				session -> session.createQuery( "delete EntityOfBasics" ).executeUpdate()
+				session -> {
+					session.createQuery( "delete EntityOfBasics" ).executeUpdate();
+					session.createQuery( "delete BasicEntity" ).executeUpdate();
+				}
 		);
 	}