HHH-19542: Use the property.value table instead of the columns table, which in case of a nested component, was null.

Author: itsmoonrack

hibernate-core/src/main/java/org/hibernate/boot/model/internal/ClassPropertyHolder.java

@@ -457,15 +457,6 @@ public Table getTable() {
 		return persistentClass.getTable();
 	}
 
-	@Override
-	public Table getSecondaryTable(String tableName) {
-		final Join join = persistentClass.getSecondaryTable( tableName );
-		if ( join != null) {
-			return join.getTable();
-		}
-		return null;
-	}
-
 	@Override
 	public boolean isComponent() {
 		return false;

hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionPropertyHolder.java

@@ -260,11 +260,6 @@ public Table getTable() {
 		return collection.getCollectionTable();
 	}
 
-	@Override
-	public Table getSecondaryTable(String tableName) {
-		throw new AssertionFailure( "Cannot get secondary table for collection" );
-	}
-
 	@Override
 	public void addProperty(Property prop, MemberDetails memberDetails, ClassDetails declaringClass) {
 		throw new AssertionFailure( "Cannot add property to a collection" );

hibernate-core/src/main/java/org/hibernate/boot/model/internal/ComponentPropertyHolder.java

@@ -221,23 +221,21 @@ public String getEntityName() {
 
 	@Override
 	public void addProperty(Property property, MemberDetails attributeMemberDetails, AnnotatedColumns columns, ClassDetails declaringClass) {
-		//Ejb3Column.checkPropertyConsistency( ); //already called earlier
+		//AnnotatedColumn.checkPropertyConsistency( ); //already called earlier
 		// Check table matches between the component and the columns
 		// if not, change the component table if no properties are set
 		// if a property is set already the core cannot support that
-		if ( columns != null ) {
-			final Table table = columns.getTable();
-			if ( !table.equals( getTable() ) ) {
-				if ( component.getPropertySpan() == 0 ) {
-					component.setTable( table );
-				}
-				else {
-					throw new AnnotationException(
-							"Embeddable class '" + component.getComponentClassName()
-									+ "' has properties mapped to two different tables"
-									+ " (all properties of the embeddable class must map to the same table)"
-					);
-				}
+		final Table table = property.getValue().getTable();
+		if ( !table.equals( getTable() ) ) {
+			if ( component.getPropertySpan() == 0 ) {
+				component.setTable( table );
+			}
+			else {
+				throw new AnnotationException(
+						"Embeddable class '" + component.getComponentClassName()
+								+ "' has properties mapped to two different tables"
+								+ " (all properties of the embeddable class must map to the same table)"
+				);
 			}
 		}
 		addProperty( property, attributeMemberDetails, declaringClass );
@@ -273,11 +271,6 @@ public Table getTable() {
 		return component.getTable();
 	}
 
-	@Override
-	public Table getSecondaryTable(String tableName) {
-		return parent.getSecondaryTable(tableName);
-	}
-
 	@Override
 	public void addProperty(Property prop, MemberDetails attributeMemberDetails, ClassDetails declaringClass) {
 		handleGenericComponentProperty( prop, attributeMemberDetails, getContext() );

hibernate-core/src/main/java/org/hibernate/boot/model/internal/EmbeddableBinder.java

@@ -41,7 +41,6 @@
 import org.hibernate.mapping.Selectable;
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.SingleTableSubclass;
-import org.hibernate.mapping.Table;
 import org.hibernate.mapping.Value;
 import org.hibernate.metamodel.mapping.EntityDiscriminatorMapping;
 import org.hibernate.metamodel.spi.EmbeddableInstantiator;
@@ -982,7 +981,8 @@ static Component createEmbeddable(
 			MetadataBuildingContext context) {
 		final Component component = new Component( context, propertyHolder.getPersistentClass() );
 		component.setEmbedded( isComponentEmbedded );
-		component.setTable( resolveTable( propertyHolder, inferredData.getClassOrElementType() ) );
+		// yuk
+		component.setTable( propertyHolder.getTable() );
 		if ( isIdentifierMapper
 				|| isComponentEmbedded && inferredData.getPropertyName() == null ) {
 			component.setComponentClassName( component.getOwner().getClassName() );
@@ -1003,27 +1003,6 @@ static Component createEmbeddable(
 		return component;
 	}
 
-	private static Table resolveTable(PropertyHolder propertyHolder, TypeDetails embeddableClass) {
-		return embeddableClass == null ? propertyHolder.getTable() : resolveTable( propertyHolder, embeddableClass.determineRawClass() );
-	}
-
-	private static Table resolveTable(PropertyHolder propertyHolder, ClassDetails embeddableClass) {
-		if ( embeddableClass != null ) {
-			for ( FieldDetails fieldDetails : embeddableClass.getFields() ) {
-				if ( fieldDetails.hasDirectAnnotationUsage( Column.class ) ) {
-					final String tableName = fieldDetails.getDirectAnnotationUsage( Column.class ).table();
-					if ( !tableName.isBlank() ) {
-						final Table secondaryTable = propertyHolder.getSecondaryTable( tableName );
-						if ( secondaryTable != null ) {
-							return secondaryTable;
-						}
-					}
-				}
-			}
-		}
-		return propertyHolder.getTable();
-	}
-
 	private static void applyColumnNamingPattern(Component component, PropertyData inferredData) {
 		final Class<?> componentClass = component.getComponentClass();
 		if ( componentClass == null || Map.class.equals( componentClass ) ) {

hibernate-core/src/main/java/org/hibernate/boot/model/internal/PropertyHolder.java

@@ -31,8 +31,6 @@ public interface PropertyHolder {
 
 	Table getTable();
 
-	Table getSecondaryTable(String tableName);
-
 	void addProperty(Property prop, MemberDetails memberDetails, ClassDetails declaringClass);
 
 	void addProperty(Property prop, MemberDetails memberDetails, AnnotatedColumns columns, ClassDetails declaringClass);

hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddableA.java

@@ -20,6 +20,7 @@ public class EmbeddableA {
 	@AttributeOverrides({@AttributeOverride(name = "embedAttrB" , column = @Column(table = "TableB"))})
 	private EmbeddableB embedB;
 
+	@Column(table = "TableB")
 	private String embedAttrA;
 
 	public EmbeddableB getEmbedB() {

hibernate-core/src/test/java/org/hibernate/orm/test/embeddable/EmbeddableAsSecondaryTableTest.java

@@ -15,7 +15,6 @@
 import jakarta.persistence.Table;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.orm.junit.NotImplementedYet;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.ServiceRegistryScope;
 import org.junit.jupiter.api.Test;
@@ -32,7 +31,6 @@
 class NestedEmbeddedObjectWithASecondaryTableTest {
 
 	@Test
-	@NotImplementedYet
 	void testNestedEmbeddedAndSecondaryTables(ServiceRegistryScope registryScope) {
 		final MetadataSources metadataSources = new MetadataSources( registryScope.getRegistry() )
 				.addAnnotatedClasses( Book.class, Author.class, House.class );

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/NestedEmbeddedObjectWithASecondaryTableTest.java

@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.records;
 
+import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
@@ -21,10 +22,10 @@
 
 @JiraKey("HHH-19542")
 @DomainModel(annotatedClasses = {
-		RecordEmbeddedAsSecondaryTableTest.UserEntity.class
+		RecordNestedEmbeddedWithASecondaryTableTest.UserEntity.class
 })
 @SessionFactory
-public class RecordEmbeddedAsSecondaryTableTest {
+public class RecordNestedEmbeddedWithASecondaryTableTest {
 
 	private UserEntity user;
 
@@ -70,6 +71,8 @@ protected UserEntity() {
 
 	@Embeddable
 	public record Person(
+			@AttributeOverride(name = "firstName", column = @Column(table = "Person"))
+			@AttributeOverride(name = "lastName", column = @Column(table = "Person"))
 			FullName fullName,
 			@Column(table = "Person")
 			Integer age) {