From 55420dfd448b797db4127c4a3768cc76bdf5a0cf Mon Sep 17 00:00:00 2001
From: Marco Belladelli <mbellade@redhat.com>
Date: Fri, 23 Dec 2022 15:35:58 +0100
Subject: [PATCH] HHH-15865 Store attribute metadata for inverse
 EmbeddedAttributeMapping

---
 .../mapping/internal/EmbeddedAttributeMapping.java       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
index 2e74923f9d67..1d5f7715dc3c 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java
@@ -14,10 +14,11 @@
 import org.hibernate.engine.FetchTiming;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.collections.CollectionHelper;
+import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.AttributeMetadataAccess;
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.mapping.EntityMappingType;
-import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.ManagedMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
@@ -27,8 +28,8 @@
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.property.access.internal.PropertyAccessStrategyBasicImpl;
 import org.hibernate.property.access.spi.PropertyAccess;
-import org.hibernate.spi.NavigablePath;
 import org.hibernate.query.sqm.sql.SqmToSqlAstConverter;
+import org.hibernate.spi.NavigablePath;
 import org.hibernate.sql.ast.Clause;
 import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.spi.FromClauseAccess;
@@ -140,7 +141,9 @@ public EmbeddedAttributeMapping(
 		super(
 				inverseModelPart.getFetchableName(),
 				-1,
-				null,
+				inverseModelPart instanceof AttributeMapping
+						? inverseModelPart.asAttributeMapping().getAttributeMetadataAccess()
+						: null,
 				inverseModelPart.getMappedFetchOptions(),
 				keyDeclaringType,
 				inverseModelPart instanceof PropertyBasedMapping ?