HHH-10430: Comment for class is ignored when using subselect in hibernate mapping - Solution

Author: koentsje

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/Helper.java

@@ -233,7 +233,8 @@ public static TableSpecificationSource createTableSource(
 							: tableInformationContainer.getSubselect(),
 					tableInformationContainer.getTable() == null
 							? inLineViewNameInferrer.inferInLineViewName()
-							: tableInformationContainer.getTable()
+							: tableInformationContainer.getTable(),
+					comment
 			);
 		}
 	}

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/InLineViewSourceImpl.java

@@ -18,17 +18,21 @@ public class InLineViewSourceImpl
 	private final String catalogName;
 	private final String selectStatement;
 	private final String logicalName;
+	private final String comment;
 
 	public InLineViewSourceImpl(
 			MappingDocument mappingDocument,
 			String schemaName,
 			String catalogName,
-			String selectStatement, String logicalName) {
+			String selectStatement, 
+			String logicalName,
+			String comment) {
 		super( mappingDocument );
 		this.schemaName = schemaName;
 		this.catalogName = catalogName;
 		this.selectStatement = selectStatement;
 		this.logicalName = logicalName;
+		this.comment = comment;
 	}
 
 	@Override
@@ -50,4 +54,9 @@ public String getSelectStatement() {
 	public String getLogicalName() {
 		return logicalName;
 	}
+	
+	@Override
+	public String getComment() {
+		return comment;
+	}
 }

hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java

@@ -2895,11 +2895,12 @@ public MetadataBuildingContext getBuildingContext() {
 		if ( isTable ) {
 			final TableSource tableSource = (TableSource) tableSpecSource;
 			table.setRowId( tableSource.getRowId() );
-			table.setComment( tableSource.getComment() );
 			if ( StringHelper.isNotEmpty( tableSource.getCheckConstraint() ) ) {
 				table.addCheckConstraint( tableSource.getCheckConstraint() );
 			}
-		}
+		} 
+
+		table.setComment(tableSpecSource.getComment());
 
 		mappingDocument.getMetadataCollector().addTableNameBinding( logicalTableName, table );
 

hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/TableSource.java

@@ -21,7 +21,5 @@ public interface TableSource extends TableSpecificationSource {
 
 	String getRowId();
 
-	String getComment();
-
 	String getCheckConstraint();
 }

hibernate-core/src/main/java/org/hibernate/boot/model/source/spi/TableSpecificationSource.java

@@ -25,4 +25,7 @@ public interface TableSpecificationSource {
 	 * @return The catalog name. If {@code null}, the binder will apply the default.
 	 */
 	public String getExplicitCatalogName();
+
+	public String getComment();
+
 }