Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-13 06:34:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-16798 Fix check for supertype-treats in single table inheritance

Browse Source 
Also, fix a small bug in special not-null discriminator predicate rendering
This commit is contained in:
Marco Belladelli 2023-08-01 10:01:20 +02:00
parent dbaf309050
commit 317334f14d
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
View File

@ -28,6 +28,7 @@
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.hibernate.AssertionFailure; import org.hibernate.AssertionFailure;
import org.hibernate.FetchMode; import org.hibernate.FetchMode;
@ -3208,21 +3209,26 @@ protected String getPrunedDiscriminatorPredicate(
} }
if ( containsNotNull ) { if ( containsNotNull ) {
final StringBuilder sb = new StringBuilder(); final String lhs;
String lhs;
if ( isDiscriminatorFormula() ) { if ( isDiscriminatorFormula() ) {
lhs = StringHelper.replace( getDiscriminatorFormulaTemplate(), Template.TEMPLATE, alias ); lhs = StringHelper.replace( getDiscriminatorFormulaTemplate(), Template.TEMPLATE, alias );
} }
else { else {
lhs = qualifyConditionally( alias, getDiscriminatorColumnName() ); lhs = qualifyConditionally( alias, getDiscriminatorColumnName() );
} }
sb.append( " or " ).append( lhs ).append( " is not in (" ); final List<String> actualDiscriminatorSQLValues = new ArrayList<>( discriminatorSQLValues.size() );
for ( Object discriminatorSQLValue : discriminatorSQLValues ) { for ( String value : discriminatorSQLValues ) {
if ( !frag.getValues().contains( discriminatorSQLValue ) ) { if ( !frag.getValues().contains( value ) && !InFragment.NULL.equals( value ) ) {
sb.append( lhs ).append( discriminatorSQLValue ); actualDiscriminatorSQLValues.add( value );
} }
} }
sb.append( ") and " ).append( lhs ).append( " is not null" ); final StringBuilder sb = new StringBuilder( 70 + actualDiscriminatorSQLValues.size() * 10 ).append( " or " );
if ( !actualDiscriminatorSQLValues.isEmpty() ) {
sb.append( lhs ).append( " is not in (" );
sb.append( String.join( ",", actualDiscriminatorSQLValues ) );
sb.append( ") and " );
}
sb.append( lhs ).append( " is not null" );
frag.getValues().remove( InFragment.NOT_NULL ); frag.getValues().remove( InFragment.NOT_NULL );
return frag.toFragmentString() + sb; return frag.toFragmentString() + sb;
} }

3
hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
View File

@ -677,7 +677,8 @@ public void pruneForSubclasses(TableGroup tableGroup, Map<String, EntityNameUse>
// Filtering for abstract entities makes no sense, so ignore that // Filtering for abstract entities makes no sense, so ignore that
// Also, it makes no sense to filter for any of the super types, // Also, it makes no sense to filter for any of the super types,
// as the query will contain a filter for that already anyway // as the query will contain a filter for that already anyway
if ( !persister.isAbstract() && !isTypeOrSuperType( persister ) && useKind == EntityNameUse.UseKind.TREAT ) { if ( useKind == EntityNameUse.UseKind.TREAT && !persister.isAbstract()
&& ( getSuperMappingType() == null || !getSuperMappingType().isTypeOrSuperType( persister ) ) ) {
containsTreatUse = true; containsTreatUse = true;
break; break;
} }