HHH-19542 embeddable property order

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 );

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/mapping/embeddable/NestedEmbeddedObjectWithASecondaryTableTest.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/records/RecordNestedEmbeddedWithASecondaryTableTest.java

@@ -0,0 +1,88 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.records;
+
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.SecondaryTable;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@JiraKey("HHH-19542")
+@DomainModel(annotatedClasses = {
+		RecordNestedEmbeddedWithASecondaryTableTest.UserEntity.class
+})
+@SessionFactory
+public class RecordNestedEmbeddedWithASecondaryTableTest {
+
+	private UserEntity user;
+
+	@BeforeAll
+	public void prepare(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			Person person = new Person( new FullName( "Sylvain", "Lecoy" ), 38 );
+			user = new UserEntity( person );
+			session.persist( user );
+		} );
+	}
+
+	@Test
+	public void test(SessionFactoryScope scope) {
+		scope.inTransaction(session -> {
+			UserEntity entity = session.find( UserEntity.class, user.id );
+			assertThat( entity ).isNotNull();
+			assertThat( entity.id ).isEqualTo( user.id );
+			assertThat( entity.person ).isNotNull();
+			assertThat( entity.person.age ).isEqualTo( 38 );
+			assertThat( entity.person.fullName.firstName ).isEqualTo( "Sylvain" );
+			assertThat( entity.person.fullName.lastName ).isEqualTo( "Lecoy" );
+		});
+	}
+
+	@Entity
+	@SecondaryTable(name = "Person")
+	public static class UserEntity {
+		@Id
+		@GeneratedValue
+		private Integer id;
+		private Person person;
+
+		public UserEntity(
+				final Person person) {
+			this.person = person;
+		}
+
+		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) {
+
+	}
+
+	@Embeddable
+	public record FullName(
+			String firstName,
+			String lastName) {
+
+	}
+}