HHH-15367 Lift embedded/id-class to-one selection limitation for from clause subqueries

Author: beikov

documentation/src/test/java/org/hibernate/userguide/hql/HQLTest.java

@@ -32,7 +32,6 @@
 import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
-import org.hibernate.dialect.TiDBDialect;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.query.QueryProducer;
 import org.hibernate.type.StandardBasicTypes;
@@ -2037,7 +2036,7 @@ public void test_hql_collection_index_operator_example_2() {
 	}
 
 	@Test
-	@SkipForDialect(value = TiDBDialect.class, comment = "TiDB db does not support subqueries for ON condition")
+	@RequiresDialectFeature(DialectChecks.SupportsSubqueryInOnClause.class)
 	public void test_hql_collection_index_operator_example_3() {
 		doInJPA(this::entityManagerFactory, entityManager -> {
 			//tag::hql-collection-index-operator-example[]
@@ -3081,8 +3080,10 @@ public void test_hql_derived_root_example() {
 	}
 
 	@Test
-	@SkipForDialect(value = TiDBDialect.class, comment = "TiDB db does not support subqueries for ON condition")
-	@RequiresDialectFeature(DialectChecks.SupportsOrderByInCorrelatedSubquery.class)
+	@RequiresDialectFeature({
+			DialectChecks.SupportsSubqueryInOnClause.class,
+			DialectChecks.SupportsOrderByInCorrelatedSubquery.class
+	})
 	public void test_hql_derived_join_example() {
 
 		doInJPA(this::entityManagerFactory, entityManager -> {

hibernate-core/src/main/java/org/hibernate/metamodel/internal/AbstractCompositeIdentifierMapping.java

@@ -233,7 +233,7 @@ public SqlTuple toSqlExpression(
 		final TableReference defaultTableReference = tableGroup.resolveTableReference( navigablePath, getContainingTableExpression() );
 		getEmbeddableTypeDescriptor().forEachSelectable(
 				(columnIndex, selection) -> {
-					final TableReference tableReference = defaultTableReference.resolveTableReference( selection.getContainingTableExpression() ) != null
+					final TableReference tableReference = getContainingTableExpression().equals( selection.getContainingTableExpression() )
 							? defaultTableReference
 							: tableGroup.resolveTableReference( navigablePath, selection.getContainingTableExpression() );
 					final Expression columnReference = sqlAstCreationState.getSqlExpressionResolver()

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedAttributeMapping.java

@@ -256,7 +256,7 @@ public SqlTuple toSqlExpression(
 		final TableReference defaultTableReference = tableGroup.resolveTableReference( navigablePath, getContainingTableExpression() );
 		getEmbeddableTypeDescriptor().forEachSelectable(
 				(columnIndex, selection) -> {
-					final TableReference tableReference = defaultTableReference.resolveTableReference( selection.getContainingTableExpression() ) != null
+					final TableReference tableReference = getContainingTableExpression().equals( selection.getContainingTableExpression() )
 							? defaultTableReference
 							: tableGroup.resolveTableReference( navigablePath, selection.getContainingTableExpression() );
 					final Expression columnReference = sqlAstCreationState.getSqlExpressionResolver().resolveSqlExpression(

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java

@@ -599,7 +599,7 @@ static String findMapsIdPropertyName(EntityMappingType entityMappingType, String
 		return null;
 	}
 
-	static void addPrefixedPropertyNames(
+	public static void addPrefixedPropertyNames(
 			Set<String> targetKeyPropertyNames,
 			String prefix,
 			Type type,

hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleBasicValuedModelPart.java

@@ -29,6 +29,7 @@
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.from.TableGroup;
+import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.results.graph.DomainResult;
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.sql.results.graph.FetchOptions;
@@ -186,10 +187,14 @@ private SqlSelection resolveSqlSelection(
 			FetchParent fetchParent,
 			SqlAstCreationState creationState) {
 		final SqlExpressionResolver expressionResolver = creationState.getSqlExpressionResolver();
+		final TableReference tableReference = tableGroup.resolveTableReference(
+				navigablePath,
+				getContainingTableExpression()
+		);
 		final Expression expression = expressionResolver.resolveSqlExpression(
-				createColumnReferenceKey( tableGroup.getPrimaryTableReference(), getSelectionExpression() ),
+				createColumnReferenceKey( tableReference, getSelectionExpression() ),
 				sqlAstProcessingState -> new ColumnReference(
-						tableGroup.resolveTableReference( navigablePath, "" ),
+						tableReference,
 						this,
 						creationState.getCreationContext().getSessionFactory()
 				)

hibernate-core/src/main/java/org/hibernate/query/derived/AnonymousTupleEmbeddedEntityIdentifierMapping.java

@@ -0,0 +1,103 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ */
+package org.hibernate.query.derived;
+
+import java.util.Map;
+
+import org.hibernate.Incubating;
+import org.hibernate.engine.spi.IdentifierValue;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
+import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping;
+import org.hibernate.metamodel.mapping.CompositeIdentifierMapping;
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
+import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
+import org.hibernate.metamodel.mapping.JdbcMapping;
+import org.hibernate.metamodel.mapping.MappingType;
+import org.hibernate.metamodel.mapping.ModelPart;
+import org.hibernate.metamodel.mapping.internal.SingleAttributeIdentifierMapping;
+import org.hibernate.metamodel.model.domain.DomainType;
+import org.hibernate.property.access.spi.PropertyAccess;
+import org.hibernate.query.sqm.SqmExpressible;
+
+/**
+ * @author Christian Beikov
+ */
+@Incubating
+public class AnonymousTupleEmbeddedEntityIdentifierMapping extends AnonymousTupleEmbeddableValuedModelPart
+		implements CompositeIdentifierMapping, SingleAttributeIdentifierMapping {
+
+	private final CompositeIdentifierMapping delegate;
+
+	public AnonymousTupleEmbeddedEntityIdentifierMapping(
+			Map<String, ModelPart> modelParts,
+			DomainType<?> domainType,
+			String componentName,
+			CompositeIdentifierMapping delegate) {
+		super(
+				modelParts,
+				domainType,
+				componentName,
+				(EmbeddableValuedModelPart) delegate
+		);
+		this.delegate = delegate;
+	}
+
+	@Override
+	public IdentifierValue getUnsavedStrategy() {
+		return delegate.getUnsavedStrategy();
+	}
+
+	@Override
+	public Object getIdentifier(Object entity, SharedSessionContractImplementor session) {
+		return delegate.getIdentifier( entity, session );
+	}
+
+	@Override
+	public Object getIdentifier(Object entity) {
+		return delegate.getIdentifier( entity );
+	}
+
+	@Override
+	public void setIdentifier(Object entity, Object id, SharedSessionContractImplementor session) {
+		delegate.setIdentifier( entity, id, session );
+	}
+
+	@Override
+	public Object instantiate() {
+		return delegate.instantiate();
+	}
+
+	@Override
+	public PropertyAccess getPropertyAccess() {
+		return ((SingleAttributeIdentifierMapping) delegate).getPropertyAccess();
+	}
+
+	@Override
+	public String getAttributeName() {
+		return getPartName();
+	}
+
+	@Override
+	public boolean hasContainingClass() {
+		return true;
+	}
+
+	@Override
+	public EmbeddableMappingType getMappedIdEmbeddableTypeDescriptor() {
+		return this;
+	}
+
+	@Override
+	public MappingType getMappedType() {
+		return this;
+	}
+
+	@Override
+	public EmbeddableMappingType getPartMappingType() {
+		return (EmbeddableMappingType) super.getPartMappingType();
+	}
+}