Branch: refs/heads/4.2
Home:
https://github.com/hibernate/hibernate-orm
Commit: 1dd3de99462345050c2a9ac2b9f0dafd7701f74c
https://github.com/hibernate/hibernate-orm/commit/1dd3de99462345050c2a9ac...
Author: Matt Drees <matt.drees(a)cru.org>
Date: 2015-12-07 (Mon, 07 Dec 2015)
Changed paths:
M hibernate-core/src/main/java/org/hibernate/cfg/Configuration.java
M
hibernate-core/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Dependent.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/DependentId.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdDepTest.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Employee.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/EmployeeId.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/Policy.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b2/PolicyId.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Dependent.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/DependentId.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/DerivedIdentityEmbeddedIdParentEmbeddedIdGrandparentEmbeddedIdColumnOverridesDepTest.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Employee.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/EmployeeId.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/Policy.java
A
hibernate-core/src/test/java/org/hibernate/test/annotations/derivedidentities/e3/b3/PolicyId.java
Log Message:
-----------
HHH-5764 - Support for multi-level derived ids
(cherry picked from commit a32372d7519616036b777e2d457189e77c1ddf6e)
(cherry picked from commit 943acc78bccdbae903060e390d99aa1dd1d4e136)
Conflicts:
hibernate-core/src/main/java/org/hibernate/boot/internal/InFlightMetadataCollectorImpl.java
hibernate-core/src/main/java/org/hibernate/cfg/CopyIdentifierComponentSecondPass.java
HHH-5764 - Support for multi-level derived ids