Re-enabled additional test and fix issue with native queries not flushing session

dreab8 · dreab8 · commit 1a9bd7d4b360 · 2020-11-25T18:18:15.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/internal/NativeQueryInterpreterStandardImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/query/internal/NativeQueryInterpreterStandardImpl.java
@@ -37,7 +37,8 @@ public <R> NativeSelectQueryPlan<R> createQueryPlan(
 				queryDefinition.getAffectedTableNames(),
 				queryDefinition.getQueryParameterList(),
 				queryDefinition.getJdbcValuesMappingProducer(),
-				queryDefinition.getRowTransformer()
+				queryDefinition.getRowTransformer(),
+				sessionFactory
 		);
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreter.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreter.java
@@ -46,7 +46,8 @@ default <R> NativeSelectQueryPlan<R> createQueryPlan(
 				queryDefinition.getAffectedTableNames(),
 				queryDefinition.getQueryParameterList(),
 				queryDefinition.getJdbcValuesMappingProducer(),
-				queryDefinition.getRowTransformer()
+				queryDefinition.getRowTransformer(),
+				sessionFactory
 		);
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
@@ -788,6 +788,9 @@ protected <T> QueryImplementor<T> buildNamedQuery(String queryName, Class<T> res
 				.getNativeQueryMemento( queryName );
 
 		if ( namedNativeDescriptor != null ) {
+			if( resultType == null){
+				resultType = (Class<T>) namedNativeDescriptor.getResultMappingClass();
+			}
 			NativeQueryImplementor query = namedNativeDescriptor.toQuery( this, resultType );
 			query.setComment( "dynamic native SQL query" );
 			applyQuerySettingsAndHints( query );
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedForeignKeyDescriptor.java
@@ -8,12 +8,15 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.util.function.Consumer;
 
 import org.hibernate.HibernateException;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.metamodel.internal.AbstractCompositeIdentifierMapping;
 import org.hibernate.metamodel.mapping.AssociationKey;
+import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.ColumnConsumer;
 import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -49,7 +52,7 @@
  */
 public class EmbeddedForeignKeyDescriptor implements ForeignKeyDescriptor, ModelPart {
 
-	private final EmbeddableValuedModelPart mappingType;
+	private final AbstractCompositeIdentifierMapping mappingType;
 	private final String keyColumnContainingTable;
 	private final List<String> keyColumnExpressions;
 	private final String targetColumnContainingTable;
@@ -170,7 +173,7 @@ public DomainResult createDomainResult(
 		final TableReference tableReference = tableGroup.resolveTableReference( keyColumnContainingTable );
 		final String identificationVariable = tableReference.getIdentificationVariable();
 		int size = keyColumnExpressions.size();
-		List<SqlSelection> sqlSelections = new ArrayList<>(size);
+		List<SqlSelection> sqlSelections = new ArrayList<>( size );
 		for ( int i = 0; i < size; i++ ) {
 			final String columnExpression = keyColumnExpressions.get( i );
 			final JdbcMapping jdbcMapping = jdbcMappings.get( i );
@@ -395,7 +398,7 @@ public <T> DomainResult<T> createDomainResult(
 		final TableReference tableReference = tableGroup.resolveTableReference( keyColumnContainingTable );
 		final String identificationVariable = tableReference.getIdentificationVariable();
 		int size = keyColumnExpressions.size();
-		List<SqlSelection> sqlSelections = new ArrayList<>(size);
+		List<SqlSelection> sqlSelections = new ArrayList<>( size );
 		for ( int i = 0; i < size; i++ ) {
 			final String columnExpression = keyColumnExpressions.get( i );
 			final JdbcMapping jdbcMapping = jdbcMappings.get( i );
@@ -443,4 +446,18 @@ public void visitJdbcTypes(
 			Consumer<JdbcMapping> action, Clause clause, TypeConfiguration typeConfiguration) {
 		mappingType.visitJdbcTypes( action, clause, typeConfiguration );
 	}
+
+	@Override
+	public void visitDisassembledJdbcValues(
+			Object value,
+			Clause clause,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		mappingType.visitDisassembledJdbcValues( value, clause, valuesConsumer, session );
+	}
+
+	@Override
+	public Object disassemble(Object value, SharedSessionContractImplementor session) {
+		return mappingType.disassemble( value, session );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EmbeddedIdentifierMappingImpl.java
@@ -7,16 +7,19 @@
 package org.hibernate.metamodel.mapping.internal;
 
 import java.util.Collection;
+import java.util.Iterator;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.metamodel.internal.AbstractCompositeIdentifierMapping;
+import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.EmbeddableMappingType;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.SingularAttributeMapping;
 import org.hibernate.metamodel.mapping.StateArrayContributorMetadataAccess;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.sql.ast.Clause;
 
 /**
  * Support for {@link javax.persistence.EmbeddedId}
@@ -108,4 +111,28 @@ public String getAttributeName() {
 		return name;
 	}
 
+	@Override
+	public void visitDisassembledJdbcValues(
+			Object value,
+			Clause clause,
+			JdbcValuesConsumer valuesConsumer,
+			SharedSessionContractImplementor session) {
+		getEmbeddableTypeDescriptor().visitDisassembledJdbcValues( value, clause, valuesConsumer, session );
+	}
+
+	@Override
+	public Object disassemble(Object value, SharedSessionContractImplementor session) {
+		final Collection<SingularAttributeMapping> attributeMappings = getAttributes();
+
+		Object[] result = new Object[attributeMappings.size()];
+		int i = 0;
+		final Iterator<SingularAttributeMapping> iterator = attributeMappings.iterator();
+		while ( iterator.hasNext() ) {
+			AttributeMapping mapping = iterator.next();
+			Object o = mapping.getPropertyAccess().getGetter().get( value );
+			result[i] = mapping.disassemble( o, session );
+			i++;
+		}
+		return result;
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/results/ResultSetMappingImpl.java
@@ -6,19 +6,25 @@
  */
 package org.hibernate.query.results;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import org.hibernate.Incubating;
 import org.hibernate.Internal;
 import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.internal.util.StringHelper;
+import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
+import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.named.NamedResultSetMappingMemento;
 import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
 import org.hibernate.sql.ast.spi.SqlSelection;
@@ -101,6 +107,19 @@ public void addLegacyFetchBuilder(DynamicFetchBuilderLegacy fetchBuilder) {
 		}
 	}
 
+	@Override
+	public void addAffectedTableNames(Set<String> affectedTableNames, SessionFactoryImplementor sessionFactory) {
+		if ( StringHelper.isEmpty( mappingIdentifier ) ) {
+			return;
+		}
+		EntityPersister entityDescriptor = sessionFactory.getMetamodel().findEntityDescriptor( mappingIdentifier );
+		if ( entityDescriptor == null ) {
+			return;
+		}
+
+		Collections.addAll( affectedTableNames, (String[]) entityDescriptor.getQuerySpaces());
+	}
+
 	@Override
 	public JdbcValuesMapping resolve(
 			JdbcValuesMetadata jdbcResultsMetadata,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
@@ -208,7 +208,10 @@ public NativeQueryImpl(
 			SharedSessionContractImplementor session) {
 		this(
 				memento,
-				() -> new ResultSetMappingImpl( resultJavaType.getName() ),
+				() -> {
+					final String mappingIdentifier = resultJavaType != null ? resultJavaType.getName() : null;
+					return new ResultSetMappingImpl( mappingIdentifier );
+				},
 				(resultSetMapping, querySpaceConsumer, context) -> {
 					if ( resultJavaType != null ) {
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeSelectQueryPlanImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeSelectQueryPlanImpl.java
@@ -8,10 +8,12 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 import org.hibernate.ScrollMode;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.mapping.BasicValuedMapping;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.model.domain.AllowableParameterType;
@@ -50,14 +52,21 @@ public NativeSelectQueryPlanImpl(
 			Set<String> affectedTableNames,
 			List<QueryParameterImplementor<?>> parameterList,
 			JdbcValuesMappingProducer resultSetMapping,
-			RowTransformer<R> rowTransformer) {
+			RowTransformer<R> rowTransformer,
+			SessionFactoryImplementor sessionFactory) {
 		this.sql = sql;
-		this.affectedTableNames = affectedTableNames;
 		this.parameterList = parameterList;
 		this.resultSetMapping = resultSetMapping;
 		this.rowTransformer = rowTransformer != null
 				? rowTransformer
 				: RowTransformerPassThruImpl.instance();
+		if ( affectedTableNames == null ) {
+			affectedTableNames = new HashSet<>();
+		}
+		if ( resultSetMapping != null ) {
+			resultSetMapping.addAffectedTableNames( affectedTableNames, sessionFactory );
+		}
+		this.affectedTableNames = affectedTableNames;
 	}
 
 	@Override
@@ -97,6 +106,8 @@ public List<R> performList(ExecutionContext executionContext) {
 			);
 		}
 
+		executionContext.getSession().autoFlushIfRequired( affectedTableNames );
+
 		final JdbcSelect jdbcSelect = new JdbcSelect(
 				sql,
 				jdbcParameterBinders,
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerStandard.java
@@ -7,6 +7,7 @@
 package org.hibernate.sql.results.jdbc.internal;
 
 import java.util.List;
+import java.util.Set;
 
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.sql.ast.spi.SqlSelection;
@@ -32,6 +33,11 @@ public JdbcValuesMappingProducerStandard(List<SqlSelection> sqlSelections, List<
 		resolvedMapping = new StandardJdbcValuesMapping( sqlSelections, domainResults );
 	}
 
+//	@Override
+//	public void addAffectedTableNames(Set<String> affectedTableNames, SessionFactoryImplementor sessionFactory) {
+//
+//	}
+
 	@Override
 	public JdbcValuesMapping resolve(
 			JdbcValuesMetadata jdbcResultsMetadata,
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingProducer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/spi/JdbcValuesMappingProducer.java
@@ -6,7 +6,10 @@
  */
 package org.hibernate.sql.results.jdbc.spi;
 
+import java.util.Set;
+
 import org.hibernate.Incubating;
+import org.hibernate.NotYetImplementedFor6Exception;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.results.ResultSetMapping;
 
@@ -31,4 +34,9 @@ public interface JdbcValuesMappingProducer {
 	JdbcValuesMapping resolve(
 			JdbcValuesMetadata jdbcResultsMetadata,
 			SessionFactoryImplementor sessionFactory);
+
+	default void addAffectedTableNames(Set<String> affectedTableNames, SessionFactoryImplementor sessionFactory) {
+		throw new NotYetImplementedFor6Exception( getClass() );
+	}
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/IdClassXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclass/xml/IdClassXmlTest.java
@@ -22,7 +22,7 @@
  *
  * @author Hardy Ferentschik
  */
-@FailureExpected( jiraKey = "HHH-4282" )
+//@FailureExpected( jiraKey = "HHH-4282" )
 @DomainModel(
 		annotatedClasses = HabitatSpeciesLink.class,
 		xmlMappings = "org/hibernate/orm/test/annotations/idclass/xml/HabitatSpeciesLink.xml"
@@ -34,8 +34,8 @@ public void testEntityMappingPropertiesAreNotIgnored(SessionFactoryScope scope)
 		scope.inTransaction(
 				session -> {
 					HabitatSpeciesLink link = new HabitatSpeciesLink();
-					link.setHabitatId( 1l );
-					link.setSpeciesId( 1l );
+					link.setHabitatId( 1L );
+					link.setSpeciesId( 1L );
 					session.persist( link );
 
 					Query q = session.getNamedQuery( "testQuery" );

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ public <R> NativeSelectQueryPlan<R> createQueryPlan(`
`37`	`37`	`queryDefinition.getAffectedTableNames(),`
`38`	`38`	`queryDefinition.getQueryParameterList(),`
`39`	`39`	`queryDefinition.getJdbcValuesMappingProducer(),`
`40`		`- queryDefinition.getRowTransformer()`
	`40`	`+ queryDefinition.getRowTransformer(),`
	`41`	`+ sessionFactory`
`41`	`42`	`);`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ default <R> NativeSelectQueryPlan<R> createQueryPlan(`
`46`	`46`	`queryDefinition.getAffectedTableNames(),`
`47`	`47`	`queryDefinition.getQueryParameterList(),`
`48`	`48`	`queryDefinition.getJdbcValuesMappingProducer(),`
`49`		`- queryDefinition.getRowTransformer()`
	`49`	`+ queryDefinition.getRowTransformer(),`
	`50`	`+ sessionFactory`
`50`	`51`	`);`
`51`	`52`	`}`
`52`	`53`