HHH-16967 Missing join on inheritance parent table to validate @where …

…condition
hibernate · Dec 4, 2023 · ed743a5 · ed743a5
1 parent 166f6e6
commit ed743a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java
@@ -6718,4 +6718,8 @@ protected String[][] getLazyPropertyColumnAliases() {
 	public String getDiscriminatorAlias() {
 		return DISCRIMINATOR_ALIAS;
 	}
+
+	protected String getSqlWhereStringTableExpression(){
+		return sqlWhereStringTableExpression;
+	}
 }
diff --git a/...nate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java b/...nate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
@@ -1366,6 +1366,13 @@ public void pruneForSubclasses(TableGroup tableGroup, Map<String, EntityNameUse>
 			if ( mainTableReference != null ) {
 				retainedTableReferences.add( mainTableReference );
 			}
+			final String sqlWhereStringTableExpression = persister.getSqlWhereStringTableExpression();
+			if ( sqlWhereStringTableExpression != null ) {
+				final TableReference tableReference = tableGroup.getTableReference( sqlWhereStringTableExpression );
+				if ( tableReference != null ) {
+					retainedTableReferences.add( tableReference );
+				}
+			}
 			if ( needsDiscriminator() ) {
 				// We allow multiple joined subclasses to use the same table if they define a discriminator column.
 				// In this case, we might need to add a discriminator condition to make sure we filter the correct subtype,