Branch: refs/heads/wip/6.0 Home: https://github.com/hibernate/hibernate-orm Commit: 6f60cd8918017d96b15e793dd202d096142c0f56 https://github.com/hibernate/hibernate-orm/commit/6f60cd8918017d96b15e793... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2021-08-30 (Mon, 30 Aug 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityDiscriminatorMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java A hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractDiscriminatorMapping.java R hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityDiscriminatorMapping.java A hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/CaseStatementDiscriminatorMappingImpl.java R hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/EntityDiscriminatorMappingImpl.java A hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ExplicitColumnDiscriminatorMappingImpl.java R hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/JoinedSubclassDiscriminatorMappingImpl.java A hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DiscriminatorSqmPath.java A hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DiscriminatorSqmPathSource.java M hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/EntityTypeImpl.java M hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java M hibernate-core/src/main/java/org/hibernate/persister/entity/DiscriminatorType.java M hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java M hibernate-core/src/main/java/org/hibernate/persister/entity/UnionSubclassEntityPersister.java M hibernate-core/src/main/java/org/hibernate/query/sqm/SemanticQueryWalker.java M hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmTreePrinter.java M hibernate-core/src/main/java/org/hibernate/query/sqm/spi/BaseSemanticQueryWalker.java M hibernate-core/src/main/java/org/hibernate/query/sqm/sql/BaseSqmToSqlAstConverter.java A hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/DiscriminatorPathInterpretation.java A hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/SelfInterpretingSqmPath.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityResultGraphNode.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultJoinedSubclassImpl.java M hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/ConvertedValueExtractor.java M hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/GoofyPersisterClassProvider.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/Address.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/Customer.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/DiscriminatorQueryUsageTests.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/DiscriminatorTest.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/Employee.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/PartTimeEmployee.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/Person.hbm.xml R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/Person.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/SimpleInheritance.hbm.xml R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/SimpleInheritanceTest.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/joined/ChildEntity.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/joined/DiscriminatorQueryUsageTests.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/joined/JoinedSubclassInheritance.hbm.xml R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/joined/JoinedSubclassInheritanceTest.java R hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/joined/ParentEntity.java M hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ejb3configuration/PersisterClassProviderTest.java M hibernate-core/src/test/java/org/hibernate/orm/test/legacy/CustomPersister.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Address.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Customer.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorQueryUsageTests.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/DiscriminatorTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Employee.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/PartTimeEmployee.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.hbm.xml A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/Person.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritance.hbm.xml A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/SimpleInheritanceTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/ChildEntity.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/DiscriminatorQueryUsageTests.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritance.hbm.xml A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/ParentEntity.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/DynamicJoinedInheritanceTests.java A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/JoinedMappings.hbm.xml A hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/dynamic/package-info.java M hibernate-core/src/test/resources/log4j2.properties M hibernate-envers/src/test/resources/log4j2.properties Log Message: ----------- improve discriminator handling - use fetch/result as the distinction for whether to select Class / entity-name or the "underlying type" value for discriminator. The only time we'd have a DomainResult for the discriminator is for Query where the type is selected; all other times want the underlying type