[hibernate-commits] [hibernate/hibernate-orm] 74f211: HHH-9637 : Join is reused when 2 explicit joins ar...
Branch: refs/heads/4.2
Home: https://github.com/hibernate/hibernate-orm
Commit: 74f21115ce235f71769de3c363dbb88608ffc48f
https://github.com/hibernate/hibernate-orm/commit/74f21115ce235f71769de3c...
Author: Gail Badner <gbadner(a)redhat.com>
Date: 2015-07-21 (Tue, 21 Jul 2015)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/hql/internal/ast/tree/DotNode.java
A hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Child.java
A hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity1.java
A hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity2.java
A hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Entity3.java
A hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/GrandChild.java
A hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/Parent.java
A
hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/ToManyFetchAndJoinTest.java
A
hibernate-core/src/test/java/org/hibernate/test/hql/fetchAndJoin/ToOneFetchAndJoinTest.java
A
hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/paths/FetchAndJoinTest.java
A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Entity1.java
A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Entity2.java
A hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Entity3.java
Log Message:
-----------
HHH-9637 : Join is reused when 2 explicit joins are used for the same ToOne association
(cherry picked from commit 6bb8d03595cdca70bc82cdcc7df9096b345e276a)
Conflicts:
hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/AbstractMetamodelSpecificTest.java
Commit: e740cb6238434432160b573bc3f765f48d8012ec
https://github.com/hibernate/hibernate-orm/commit/e740cb6238434432160b573...
Author: Gail Badner <gbadner(a)redhat.com>
Date: 2015-07-21 (Tue, 21 Jul 2015)
Changed paths:
M
hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/AbstractMetamodelSpecificTest.java
A hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Entity1.java
A hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Entity2.java
A hibernate-entitymanager/src/test/java/org/hibernate/ejb/metamodel/Entity3.java
M
hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/paths/FetchAndJoinTest.java
R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Entity1.java
R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Entity2.java
R hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/metamodel/Entity3.java
Log Message:
-----------
HHH-9637 : Correction to test case for 4.2 branch
Compare: https://github.com/hibernate/hibernate-orm/compare/55941e664508...e740cb6...