Branch: refs/heads/5.3 Home: https://github.com/hibernate/hibernate-orm Commit: 91ede032c9e4560dee9bffed6972422e1e0468ac https://github.com/hibernate/hibernate-orm/commit/91ede032c9e4560dee9bffe... Author: Guillaume Smet <guillaume.smet(a)gmail.com&gt; Date: 2018-12-18 (Tue, 18 Dec 2018) Changed paths: M hibernate-core/src/main/java/org/hibernate/type/AbstractStandardBasicType.java M hibernate-core/src/main/java/org/hibernate/type/ClobType.java M hibernate-core/src/main/java/org/hibernate/type/NClobType.java M hibernate-core/src/main/java/org/hibernate/type/TypeHelper.java M hibernate-core/src/test/java/org/hibernate/test/nationalized/NationalizedLobFieldTest.java A hibernate-core/src/test/java/org/hibernate/test/type/LobUnfetchedPropertyTest.java M hibernate-core/src/test/java/org/hibernate/test/type/TypeTest.java M hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java Log Message: ----------- HHH-12555 Fix merging of lazy loaded blobs/clobs/nclobs It's better to avoid pushing UNFETCHED_PROPERTY to the types as it requires all the types to take it into account. TypeHelper looks like the only sensible caller that needs change. (cherry picked from commit 1af878166fe0883ceb3d9130afa2790850492624) HHH-12555 Add tests (cherry picked from commit 4e05953240264d32fe67f6e0f1810d8168c2725f) HHH-12555 : Update test to check results (cherry picked from commit ca6dc226eb53a0f40978847d2d251b64c5e49f41) HHH-12555 : Remove code in LobMergeStrategy implementations that copied original Lob when target is null (cherry picked from commit 4d0b5dc184f7b48a493da31edfe4acea30c8e975) HHH-12555 Add a DialectCheck for NClob support (cherry picked from commit 855f34c77181fd9ff103a8d2bf9c9bfb37360f2c) HHH-12555 Disable NClob test for dialects not supporting NClob (cherry picked from commit 98249af058a1f6408fcfca5a61d675af192458a1) **NOTE:** This service has 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.