HHH-15283 - fix NPE for NamedNativeQuery + SqlResultSetMapping (columns)

Author: dreab8

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

@@ -166,7 +166,7 @@ public boolean equals(Object o) {
 		if ( !Objects.equals( explicitType, that.explicitType ) ) {
 			return false;
 		}
-		return explicitJavaType.equals( that.explicitJavaType );
+		return Objects.equals( explicitJavaType, that.explicitJavaType );
 	}
 
 	@Override

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

@@ -12,13 +12,18 @@
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.ColumnResult;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.NamedNativeQuery;
 import jakarta.persistence.SqlResultSetMapping;
+import jakarta.persistence.Table;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author Nathan Xu
@@ -30,25 +35,50 @@
 @TestForIssue(jiraKey = "HHH-15070")
 class NamedNativeQueryWithCountColumnTest {
 
+	@BeforeEach
+	public void setUp(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					for ( int i = 0; i < 3; i++ ) {
+						Sample sample = new Sample( i, String.valueOf( i ) );
+						entityManager.persist( sample );
+					}
+				}
+		);
+	}
+
 	@Test
-	void testNoNullPointerExceptionThrown(EntityManagerFactoryScope scope) {
-		scope.inTransaction( em ->em.createNamedQuery( "sample.count", Long.class ) );
+	void testNamedNativeQuery(EntityManagerFactoryScope scope) {
+		scope.inTransaction( em -> {
+			Long count = em.createNamedQuery( "sample.count", Long.class ).getSingleResult();
+			assertThat( count, is( 3l ) );
+		} );
 	}
 
 	@SqlResultSetMapping(
-		name = "mapping",
-		columns = @ColumnResult( name = "cnt" )
+			name = "mapping",
+			columns = @ColumnResult(name = "cnt")
 	)
 	@NamedNativeQuery(
-		name = "sample.count",
-		resultSetMapping = "mapping",
-		query = "SELECT count(*) AS cnt FROM Sample"
+			name = "sample.count",
+			resultSetMapping = "mapping",
+			query = "SELECT count(*) AS cnt FROM SAMPLE_TABLE"
 	)
 	@Entity(name = "Sample")
+	@Table(name = "SAMPLE_TABLE")
 	static class Sample {
 
 		@Id
-		Long id;
+		Integer id;
+
+		String name;
+
+		public Sample() {
+		}
 
+		public Sample(Integer id, String name) {
+			this.id = id;
+			this.name = name;
+		}
 	}
 }