@@ -2794,11 +2794,11 @@ public TableGroup createRootTableGroup(
2794
2794
}
2795
2795
2796
2796
if ( softDeleteMapping != null ) {
2797
- final TableReference tableReference = tableGroup . resolveTableReference ( getSoftDeleteTableDetails (). getTableName () );
2798
- final Predicate softDeletePredicate = softDeleteMapping . createNonDeletedRestriction (
2799
- tableReference ,
2800
- creationState . getSqlExpressionResolver ()
2801
- );
2797
+ final TableReference tableReference =
2798
+ tableGroup . resolveTableReference ( getSoftDeleteTableDetails (). getTableName () );
2799
+ final Predicate softDeletePredicate =
2800
+ softDeleteMapping . createNonDeletedRestriction ( tableReference ,
2801
+ creationState . getSqlExpressionResolver () );
2802
2802
additionalPredicateCollectorAccess .get ().accept ( softDeletePredicate );
2803
2803
if ( tableReference != rootTableReference && creationState .supportsEntityNameUsage () ) {
2804
2804
// Register entity name usage for the hierarchy root table to avoid pruning
@@ -2818,9 +2818,9 @@ public void applyDiscriminator(
2818
2818
SqlAstCreationState creationState ) {
2819
2819
if ( needsDiscriminator () ) {
2820
2820
assert !creationState .supportsEntityNameUsage () : "Entity name usage should have been used instead" ;
2821
- final Map <String , EntityNameUse > entityNameUseMap ;
2822
2821
final Collection <EntityMappingType > subMappingTypes = getSubMappingTypes ();
2823
- entityNameUseMap = new HashMap <>( 1 + subMappingTypes .size () + ( isInherited () ? 1 : 0 ) );
2822
+ final Map <String , EntityNameUse > entityNameUseMap =
2823
+ new HashMap <>( 1 + subMappingTypes .size () + ( isInherited () ? 1 : 0 ) );
2824
2824
if ( subMappingTypes .isEmpty () ) {
2825
2825
entityNameUseMap .put ( getEntityName (), EntityNameUse .TREAT );
2826
2826
}
@@ -3081,16 +3081,16 @@ private String getAliasInWhere(TableGroup tableGroup, boolean useQualifier) {
3081
3081
protected boolean shouldInnerJoinSubclassTable (int subclassTableNumber , Set <String > treatAsDeclarations ) {
3082
3082
if ( isClassOrSuperclassJoin ( subclassTableNumber ) ) {
3083
3083
// the table is either this persister's driving table or (one of) its superclass persister's driving
3084
- // tables which can be inner joined as long as the ` shouldInnerJoin` condition resolves to true
3084
+ // tables which can be inner- joined as long as the ' shouldInnerJoin' condition resolves to true
3085
3085
return !isInverseTable ( subclassTableNumber )
3086
3086
&& !isNullableTable ( subclassTableNumber );
3087
3087
}
3088
3088
3089
3089
// otherwise we have a subclass table and need to look a little deeper...
3090
3090
3091
- // IMPL NOTE : By default includeSubclasses indicates that all subclasses should be joined and that each
3092
- // subclass ought to be joined by outer- join. However, TREAT-AS always requires that an inner- join be used
3093
- // so we give TREAT-AS higher precedence...
3091
+ // IMPL NOTE: By default, ' includeSubclasses' indicates that all subclasses should be joined and that each
3092
+ // subclass ought to be joined by outer join. However, ' TREAT AS' always requires that an inner join be used,
3093
+ // so we give ' TREAT AS' higher precedence...
3094
3094
3095
3095
return isSubclassTableIndicatedByTreatAsDeclarations ( subclassTableNumber , treatAsDeclarations );
3096
3096
}
0 commit comments