HHH-19004 Reproducer: TenantId regression on @EmbeddedId 6.6.0 -> 6.6.1

orm/hibernate-orm-6/pom.xml

@@ -10,7 +10,7 @@
 	<properties>
 		<version.com.h2database>2.3.232</version.com.h2database>
 		<version.junit-jupiter>5.11.4</version.junit-jupiter>
-		<version.org.hibernate.orm>6.6.4.Final</version.org.hibernate.orm>
+		<version.org.hibernate.orm>6.6.1.Final</version.org.hibernate.orm>
 		<version.org.assertj.assertj-core>3.27.1</version.org.assertj.assertj-core>
 	</properties>
 

orm/hibernate-orm-6/src/test/java/org/hibernate/bugs/JPAUnitTestCase.java

@@ -1,5 +1,16 @@
 package org.hibernate.bugs;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
+import java.io.Serializable;
+import java.util.Map;
+import org.hibernate.annotations.TenantId;
+import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -25,6 +36,37 @@ void destroy() {
 		entityManagerFactory.close();
 	}
 
+	@Entity
+	@Table(name = "display_id")
+	public class DisplayIdBE {
+
+		@EmbeddedId
+		private DisplayIdKeyBE id;
+
+		@Column(name = "display_id_value", nullable = false)
+		private long displayIdValue;
+	}
+
+	public enum DisplayIdType {
+		TYPE1,
+		TYPE2
+	}
+
+	@Embeddable
+	public class DisplayIdKeyBE implements Serializable {
+
+		@TenantId
+		@Column(name = "tenant_id", nullable = false)
+		private Long tenantId;
+
+		@Column(name = "type", nullable = false)
+		@Enumerated(EnumType.STRING)
+		private DisplayIdType type;
+
+		// For Hibernate
+		protected DisplayIdKeyBE() {}
+	}
+
 	// Entities are auto-discovered, so just add them anywhere on class-path
 	// Add your tests, using standard JUnit.
 	@Test

orm/hibernate-orm-6/src/test/java/org/hibernate/bugs/Resolver.java

@@ -0,0 +1,14 @@
+package org.hibernate.bugs;
+
+import org.hibernate.context.spi.CurrentTenantIdentifierResolver;
+
+public class Resolver implements CurrentTenantIdentifierResolver<Long> {
+  @Override
+  public Long resolveCurrentTenantIdentifier() {
+    return 0L;
+  }
+  @Override
+  public boolean validateExistingCurrentSessions() {
+    return false;
+  }
+}

orm/hibernate-orm-6/src/test/resources/hibernate.properties

@@ -10,7 +10,8 @@ hibernate.connection.driver_class org.h2.Driver
 #hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE
 hibernate.connection.url jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
 hibernate.connection.username sa
-hibernate.connection.password 
+hibernate.connection.password
+hibernate.tenant_identifier_resolver=org.hibernate.bugs.Resolver
 
 hibernate.connection.pool_size 5