[hibernate-commits] [hibernate/hibernate-orm] e171ae: HHH-12592 : add assertions to ensure that the deta...

Branch: refs/heads/5.2 Home: https://github.com/hibernate/hibernate-orm Commit: e171ae965c98f99ff30c4ab4cd7d1580bd9a0a21 https://github.com/hibernate/hibernate-orm/commit/e171ae965c98f99ff30c4ab... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2018-06-27 (Wed, 27 Jun 2018) Changed paths: M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java Log Message: ----------- HHH-12592 : add assertions to ensure that the detached and merged collection are not the same, which currently fails (cherry picked from commit c3c0cd550fb9ad13ace8ed9ba5645a9231053f6d) Commit: ad79d47dc78c23507b745bd095ab141e089285c7 https://github.com/hibernate/hibernate-orm/commit/ad79d47dc78c23507b745bd... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2018-06-27 (Wed, 27 Jun 2018) Changed paths: M hibernate-core/src/main/java/org/hibernate/type/CollectionType.java Log Message: ----------- Revert "HHH-12592 - Fix merging detached enhanced entities with orphan-removal collections." This reverts commit 4f119105f887855d6baecb0ac8837d984b40b4b7. (cherry picked from commit e1b08967d947f12ee774ebbbc5b9e1a38a360603) Commit: 1bd3fb913991c0542f1718113d429267f22ce970 https://github.com/hibernate/hibernate-orm/commit/1bd3fb913991c0542f17181... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2018-06-27 (Wed, 27 Jun 2018) Changed paths: A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedDetachedCollectionInEmbeddableTest.java M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedDetachedOrphanRemovalTest.java Log Message: ----------- HHH-12592 : Add more tests (cherry picked from commit 6aa8301499577746ff66ecd735a6330e3e373e38) Commit: 83d9c3eb93d447e4aead683f651d4e6d55a09443 https://github.com/hibernate/hibernate-orm/commit/83d9c3eb93d447e4aead683... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2018-06-27 (Wed, 27 Jun 2018) Changed paths: M hibernate-core/src/main/java/org/hibernate/engine/loading/internal/CollectionLoadContext.java Log Message: ----------- HHH-12592 - Fix merging detached enhanced entities with orphan-removal collections. (cherry picked from commit 01caa5f2b4d5dfee04016d6628a529e437894dcb) Commit: 4e8ff8c12d2376ea63879bb14630025dec83c98f https://github.com/hibernate/hibernate-orm/commit/4e8ff8c12d2376ea63879bb... Author: Gail Badner <gbadner(a)redhat.com&gt; Date: 2018-06-27 (Wed, 27 Jun 2018) Changed paths: M hibernate-core/src/main/java/org/hibernate/engine/loading/internal/CollectionLoadContext.java M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/Leaf.java A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeDetachedCascadedCollectionInEmbeddableTest.java A hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeDetachedNonCascadedCollectionInEmbeddableTest.java R hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/MergeEnhancedDetachedCollectionInEmbeddableTest.java M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/merge/Root.java Log Message: ----------- HHH-12637 : Improvement to fix for HHH-12592 HHH-12637 : Rename/add new tests; remove sequences from IDs (cherry picked from commit 3dcf69c6870e38c6de501325e7444cd44e351bc9) Compare: https://github.com/hibernate/hibernate-orm/compare/cf891dbe929e...4e8ff8c... **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.