Test for HHH-10577

hibernate-core/src/test/java/org/hibernate/test/hql/CollectionMapWithComponentValueTest.java

@@ -6,10 +6,6 @@
  */
 package org.hibernate.test.hql;
 
-/**
- * @author Andrea Boriero
- */
-
 import javax.persistence.ElementCollection;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
@@ -24,6 +20,7 @@
 import org.hibernate.query.Query;
 import org.hibernate.resource.transaction.spi.TransactionStatus;
 
+import org.hibernate.testing.TestForIssue;
 import org.junit.After;
 import org.junit.Test;
 
@@ -37,9 +34,10 @@
 
 /**
  * @author Andrea Boriero
+ * @author Christian Beikov
  */
 public class CollectionMapWithComponentValueTest extends BaseCoreFunctionalTestCase {
-	private final KeyValue keyValue = new KeyValue();
+	private final KeyValue keyValue = new KeyValue( "key1" );
 
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
@@ -62,7 +60,7 @@ protected void prepareTest() throws Exception {
 			testEntity.values = map;
 			s.save( testEntity );
 
-			KeyValue keyValue2 = new KeyValue();
+			KeyValue keyValue2 = new KeyValue( "key2" );
 			s.save( keyValue2 );
 			TestEntity testEntity2 = new TestEntity();
 			EmbeddableValue embeddableValue2 = new EmbeddableValue();
@@ -133,6 +131,17 @@ public void testMapEntryExpressionInSelect() {
 		} );
 	}
 
+	@Test
+	@TestForIssue(jiraKey = "HHH-10577")
+	public void testMapKeyExpressionDereferenceInSelect() {
+		doInHibernate( this::sessionFactory, s -> {
+			List<String> keyValueNames = s.createQuery( "select key(v).name as name from TestEntity te join te.values v order by name", String.class ).list();
+			assertEquals( 2, keyValueNames.size() );
+			assertEquals( "key1", keyValueNames.get( 0 ) );
+			assertEquals( "key2", keyValueNames.get( 1 ) );
+		} );
+	}
+
 	@Override
 	protected boolean isCleanupTestDataRequired() {
 		return true;
@@ -155,6 +164,15 @@ public static class KeyValue {
 		@Id
 		@GeneratedValue
 		Long id;
+
+		String name;
+
+		public KeyValue() {
+		}
+
+		public KeyValue(String name) {
+			this.name = name;
+		}
 	}
 
 	@Embeddable