Branch: refs/heads/5.0 Home: https://github.com/hibernate/hibernate-orm Commit: 634707cad9af7717c143d7dd6aa8f7a921d515a5 https://github.com/hibernate/hibernate-orm/commit/634707cad9af7717c143d7d... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2015-09-29 (Tue, 29 Sep 2015) Changed paths: M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/AbstractMapComponentNode.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElement.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/FromElementType.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapEntryNode.java A hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapKeyEntityFromElement.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/MapKeyNode.java M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/SelectClause.java M hibernate-core/src/test/java/org/hibernate/test/hql/MapFunctionExpressionsTest.java Log Message: ----------- HHH-10125 - KEY() function in HQL causes inaccurate SQL when map key is an entity; HHH-10132 - ENTRY() function in HQL causes invalid SQL when map key is an entity (cherry picked from commit 3cdc4476542424bf9a306c79fac3beb2a2580657)