Branch: refs/heads/wip/6.0 Home: https://github.com/hibernate/hibernate-orm Commit: a532445e35a94a4931e21c1f622e873df7bec029 https://github.com/hibernate/hibernate-orm/commit/a532445e35a94a4931e21c1... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2021-08-20 (Fri, 20 Aug 2021) Changed paths: A hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/CriteriaStringInlineLiteralTest.java R hibernate-core/src/test/java/org/hibernate/query/criteria/CriteriaStringInlineLiteralTest.java Log Message: ----------- test migration Commit: 83ac9d5d3d2059ed32b78ce89934e289186c959a https://github.com/hibernate/hibernate-orm/commit/83ac9d5d3d2059ed32b78ce... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2021-08-20 (Fri, 20 Aug 2021) Changed paths: M hibernate-core/hibernate-core.gradle Log Message: ----------- xjc task config Commit: c0de4c7854e45574855c42f295be931d62951b52 https://github.com/hibernate/hibernate-orm/commit/c0de4c7854e45574855c42f... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2021-08-20 (Fri, 20 Aug 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java M hibernate-core/src/main/java/org/hibernate/boot/query/SqlResultSetMappingDescriptor.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityDiscriminatorMapping.java M hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/AbstractEntityDiscriminatorMapping.java M hibernate-core/src/main/java/org/hibernate/procedure/internal/EntityDomainResultBuilder.java M hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityJpa.java M hibernate-core/src/main/java/org/hibernate/query/internal/ResultMementoEntityStandard.java A hibernate-core/src/main/java/org/hibernate/query/results/BasicValuedFetchBuilder.java M hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteFetchBuilderBasicPart.java M hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityJpa.java M hibernate-core/src/main/java/org/hibernate/query/results/complete/CompleteResultBuilderEntityStandard.java M hibernate-core/src/main/java/org/hibernate/query/results/complete/EntityResultImpl.java M hibernate-core/src/main/java/org/hibernate/query/results/implicit/ImplicitFetchBuilderBasic.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/AbstractEntityInitializer.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/EntityFetchJoinedImpl.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityJoinedFetchInitializer.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultImpl.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultInitializer.java M hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityResultJoinedSubclassImpl.java A hibernate-core/src/test/java/org/hibernate/orm/test/legacy/AbcTransitionTests.java Log Message: ----------- discriminator work - Handle discriminator as Fetch for entity ResultGraphNodes. This allows us to make the distinction about whether to handle the discriminator as `Class` or as its "underlying" type when selecting it. Fetches return the underlying type. DomainResults return `Class`, or String for entity-named entity mappings Commit: 78bd816a855a0483493fc30a50f25bfd77aa8057 https://github.com/hibernate/hibernate-orm/commit/78bd816a855a0483493fc30... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2021-08-20 (Fri, 20 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/internal/AbstractEntityDiscriminatorMapping.java A hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/DiscriminatorQueryUsageTests.java Log Message: ----------- discriminator work - Handle discriminator as Fetch for entity ResultGraphNodes. This allows us to make the distinction about whether to handle the discriminator as `Class` or as its "underlying" type when selecting it. Fetches return the underlying type. DomainResults return `Class`, or String for entity-named entity mappings Commit: fb651ef07d02afcf745c808ed18ea14927ef7502 https://github.com/hibernate/hibernate-orm/commit/fb651ef07d02afcf745c808... Author: Steve Ebersole <steve(a)hibernate.org&gt; Date: 2021-08-20 (Fri, 20 Aug 2021) Changed paths: M hibernate-core/src/test/java/org/hibernate/orm/test/discriminator/DiscriminatorQueryUsageTests.java Log Message: ----------- discriminator work - Handle discriminator as Fetch for entity ResultGraphNodes. This allows us to make the distinction about whether to handle the discriminator as `Class` or as its "underlying" type when selecting it. Fetches return the underlying type. DomainResults return `Class`, or String for entity-named entity mappings Compare: https://github.com/hibernate/hibernate-orm/compare/bbc9e6af2073...fb651ef...