Branch: refs/heads/5.1 Home: https://github.com/hibernate/hibernate-orm Commit: 8e64e3ac934be171947eaf25fc222e1083a58cc0 https://github.com/hibernate/hibernate-orm/commit/8e64e3ac934be171947eaf2... Author: Guillaume Smet <guillaume.smet(a)gmail.com&gt; Date: 2016-06-30 (Thu, 30 Jun 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/cfg/Ejb3Column.java M hibernate-core/src/test/java/org/hibernate/test/namingstrategy/components/ComponentNamingStrategyTest.java Log Message: ----------- HHH-10863 Be consistent in the parameter passed to ImplicitNamingStrategy#determineBasicColumnName When dealing with an element collection (say items.name), ImplicitNamingStrategy#determineBasicColumnName is sometimes called with items.collection&&element.name and sometimes with items.name. This is due to HHH-6005 which removes the "collection&&element." part before calling determineBasicColumnName. With this patch, we only remove the "collection&&element." part before calling the physical naming strategy, thus allowing us to be consistent in the way we call ImplicitNamingStrategy#determineBasicColumnName. (cherry picked from commit 9fd61a10dba3b61ec5b1f4dc5357ab4a4aeeb219) Commit: af8ffdee8fda44b8d7f34f48b2b470c7779447ea https://github.com/hibernate/hibernate-orm/commit/af8ffdee8fda44b8d7f34f4... Author: Guillaume Smet <guillaume.smet(a)gmail.com&gt; Date: 2016-06-30 (Thu, 30 Jun 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AbstractAttributeKey.java A hibernate-core/src/test/java/org/hibernate/test/boot/model/source/AttributePathTest.java Log Message: ----------- HHH-10863 Add a isCollectionElement() method to AbstractAttributeKey It allows external libraries to test for the collection element marker without being aware of the exact syntax used as it might change in the future. (cherry picked from commit 7f3a3bcbcc0a6e73c88f785d0fc24b8a70cec321) Commit: 0fddd62fc0965280274eaa821b613d2d3cc64716 https://github.com/hibernate/hibernate-orm/commit/0fddd62fc0965280274eaa8... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2016-06-30 (Thu, 30 Jun 2016) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/AbstractAttributeKey.java Log Message: ----------- HHH-10863 - Improve consistency of how we call implicitNamingStrategy.determineBasicColumnName with element collections (cherry picked from commit 5b5d2b655947e8fbbd969fd7ac709fe30265121e) Compare: https://github.com/hibernate/hibernate-orm/compare/8e8be9aeb440...0fddd62...