HHH-19542: Testing the idea

Author: itsmoonrack

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

@@ -8,7 +8,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
@@ -164,7 +163,7 @@ public void checkPropertyConsistency() {
 								"Column mappings for property '" + propertyName + "' mix updatable with 'updatable=false'"
 						);
 					}
-					if ( !Objects.equals( current.getExplicitTableName(), previous.getExplicitTableName() ) ) {
+					if ( !current.getExplicitTableName().equals( previous.getExplicitTableName() ) ) {
 						throw new AnnotationException(
 								"Column mappings for property '" + propertyName + "' mix distinct secondary tables"
 						);

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

@@ -4,8 +4,11 @@
  */
 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.boot.spi.MetadataBuildingContext;
@@ -68,7 +71,7 @@ public class ComponentPropertyHolder extends AbstractPropertyHolder {
 
 	private final String embeddedAttributeName;
 	private final Map<String,AttributeConversionInfo> attributeConversionInfoMap;
-	private final AnnotatedColumns annotatedColumns;
+	private final List<AnnotatedColumn> annotatedColumns;
 
 	public ComponentPropertyHolder(
 			Component component,
@@ -99,8 +102,7 @@ public ComponentPropertyHolder(
 		if ( parent instanceof ComponentPropertyHolder componentHolder ) {
 			this.annotatedColumns = componentHolder.annotatedColumns;
 		} else {
-			this.annotatedColumns = new AnnotatedColumns();
-			this.annotatedColumns.setPropertyName( inferredData.getPropertyName() );
+			this.annotatedColumns = new ArrayList<>();
 		}
 	}
 
@@ -228,7 +230,19 @@ public String getEntityName() {
 	}
 
 	public void checkPropertyConsistency() {
-		this.annotatedColumns.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( current.getExplicitTableName(), 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)"
+					);
+				}
+			}
+		}
 	}
 
 	@Override
@@ -261,7 +275,7 @@ public void addProperty(Property property, MemberDetails attributeMemberDetails,
 				if ( column.getExplicitTableName() == null ) {
 					column.setExplicitTableName( "" );
 				}
-				this.annotatedColumns.addColumn( column );
+				this.annotatedColumns.add( column );
 			}
 		}
 		addProperty( property, attributeMemberDetails, declaringClass );

hibernate-core/src/test/java/org/hibernate/orm/test/records/RecordNestedEmbeddedWithASecondaryTableTest.java

@@ -82,7 +82,7 @@ public record Person(
 	public record FullName(
 			@Column(table = "Person")
 			String firstName,
-			@Column(table = "Person")
+//			@Column(table = "Person")
 			String lastName) {
 
 	}

hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component1.java

@@ -4,18 +4,15 @@
  */
 package org.hibernate.orm.test.envers.entities.components;
 
-import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 
 /**
  * @author Adam Warski (adam at warski dot org)
  */
 @Embeddable
 public class Component1 {
-	@Column
 	private String str1;
 
-	@Column
 	private String str2;
 
 	public Component1(String str1, String str2) {

hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component2.java

@@ -4,18 +4,15 @@
  */
 package org.hibernate.orm.test.envers.entities.components;
 
-import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 
 /**
  * @author Adam Warski (adam at warski dot org)
  */
 @Embeddable
 public class Component2 {
-	@Column
 	private String str5;
 
-	@Column
 	private String str6;
 
 	public Component2(String str5, String str6) {

hibernate-envers/src/test/java/org/hibernate/orm/test/envers/entities/components/Component3.java

@@ -8,7 +8,6 @@
 import jakarta.persistence.AttributeOverrides;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
-
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.NotAudited;
 
@@ -21,7 +20,6 @@
 @Embeddable
 @Audited
 public class Component3 {
-	@Column
 	private String str1;
 
 	@AttributeOverrides({