HHH-19542 Ensure columns in embeddables default to correct table

Author: beikov

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

@@ -106,7 +106,7 @@ public boolean isSecondary() {
 		final String explicitTableName = firstColumn.getExplicitTableName();
 		//note: checkPropertyConsistency() is responsible for ensuring they all have the same table name
 		return isNotEmpty( explicitTableName )
-				&& !getPropertyHolder().getTable().getName().equals( explicitTableName );
+				&& !getOwnerTable().getName().equals( explicitTableName );
 	}
 
 	/**
@@ -125,10 +125,18 @@ public Table getTable() {
 			// all the columns have to be mapped to the same table
 			// even though at the annotation level it looks like
 			// they could each specify a different table
-			return isSecondary() ? getJoin().getTable() : getPropertyHolder().getTable();
+			return isSecondary() ? getJoin().getTable() : getOwnerTable();
 		}
 	}
 
+	private Table getOwnerTable() {
+		PropertyHolder holder = getPropertyHolder();
+		while ( holder instanceof ComponentPropertyHolder ) {
+			holder = ( (ComponentPropertyHolder) holder ).parent;
+		}
+		return holder.getTable();
+	}
+
 	public void setTable(Table table) {
 		this.table = table;
 	}

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

@@ -6,18 +6,14 @@
  */
 package org.hibernate.boot.model.internal;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.PropertyData;
-import org.hibernate.internal.util.StringHelper;
 import org.hibernate.mapping.AggregateColumn;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.Join;
@@ -78,7 +74,6 @@ public class ComponentPropertyHolder extends AbstractPropertyHolder {
 
 	private final String embeddedAttributeName;
 	private final Map<String,AttributeConversionInfo> attributeConversionInfoMap;
-	private final List<AnnotatedColumn> annotatedColumns;
 
 	public ComponentPropertyHolder(
 			Component component,
@@ -105,12 +100,6 @@ public ComponentPropertyHolder(
 			this.embeddedAttributeName = "";
 			this.attributeConversionInfoMap = processAttributeConversions( inferredData.getClassOrPluralElement() );
 		}
-
-		if ( parent instanceof ComponentPropertyHolder ) {
-			this.annotatedColumns = ( (ComponentPropertyHolder) parent ).annotatedColumns;
-		} else {
-			this.annotatedColumns = new ArrayList<>();
-		}
 	}
 
 	/**
@@ -281,7 +270,12 @@ public void addProperty(Property property, AnnotatedColumns columns, XClass decl
 		// 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
-		final Table table = property.getValue().getTable();
+		assert columns == null || property.getValue().getTable() == columns.getTable();
+		setTable( property.getValue().getTable() );
+		addProperty( property, declaringClass );
+	}
+
+	private void setTable(Table table) {
 		if ( !table.equals( getTable() ) ) {
 			if ( component.getPropertySpan() == 0 ) {
 				component.setTable( table );
@@ -293,27 +287,8 @@ public void addProperty(Property property, AnnotatedColumns columns, XClass decl
 						+ " (all properties of the embeddable class must map to the same table)"
 				);
 			}
-		}
-		if ( columns != null ) {
-			annotatedColumns.addAll( columns.getColumns() );
-		}
-		addProperty( property, declaringClass );
-	}
-
-	public void checkPropertyConsistency() {
-		if ( annotatedColumns.size() > 1 ) {
-			for ( int currentIndex = 1; currentIndex < annotatedColumns.size(); currentIndex++ ) {
-				final AnnotatedColumn current = annotatedColumns.get( currentIndex );
-				final AnnotatedColumn previous = annotatedColumns.get( currentIndex - 1 );
-				if ( !Objects.equals(
-						StringHelper.nullIfEmpty( current.getExplicitTableName() ),
-						StringHelper.nullIfEmpty( previous.getExplicitTableName() ) ) ) {
-					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)"
-					);
-				}
+			if ( parent instanceof ComponentPropertyHolder ) {
+				( (ComponentPropertyHolder) parent ).setTable( table );
 			}
 		}
 	}

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

@@ -343,7 +343,7 @@ static Component fillEmbeddable(
 
 		final String subpath = getPath( propertyHolder, inferredData );
 		LOG.tracev( "Binding component with path: {0}", subpath );
-		final ComponentPropertyHolder subholder = buildPropertyHolder(
+		final PropertyHolder subholder = buildPropertyHolder(
 				component,
 				subpath,
 				inferredData,
@@ -470,8 +470,6 @@ else if ( member.isAnnotationPresent( GeneratedValue.class ) ) {
 			}
 		}
 
-		subholder.checkPropertyConsistency();
-
 		if ( compositeUserType != null ) {
 			processCompositeUserType( component, compositeUserType );
 		}

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

@@ -49,7 +49,7 @@ public static PropertyHolder buildPropertyHolder(
 	 *
 	 * @return PropertyHolder
 	 */
-	public static ComponentPropertyHolder buildPropertyHolder(
+	public static PropertyHolder buildPropertyHolder(
 			Component component,
 			String path,
 			PropertyData inferredData,