HHH-12565 Fix that returns the discriminator constant instead of column reference for leaf subtypes

beikov · sebersole · commit f62cecc62bb9 · 2018-05-14T12:25:27.000-05:00
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
@@ -338,7 +338,11 @@ public String getDiscriminatorColumnReaders() {
 	}
 
 	public String getDiscriminatorColumnReaderTemplate() {
-		return Template.TEMPLATE + "." + DISCRIMINATOR_ALIAS;
+		if ( getEntityMetamodel().getSubclassEntityNames().size() == 1 ) {
+			return getDiscriminatorSQLValue();
+		} else {
+			return Template.TEMPLATE + "." + DISCRIMINATOR_ALIAS;
+		}
 	}
 
 	protected String getDiscriminatorAlias() {

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,11 @@ public String getDiscriminatorColumnReaders() {`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`public String getDiscriminatorColumnReaderTemplate() {`
`341`		`- return Template.TEMPLATE + "." + DISCRIMINATOR_ALIAS;`
	`341`	`+ if ( getEntityMetamodel().getSubclassEntityNames().size() == 1 ) {`
	`342`	`+ return getDiscriminatorSQLValue();`
	`343`	`+ } else {`
	`344`	`+ return Template.TEMPLATE + "." + DISCRIMINATOR_ALIAS;`
	`345`	`+ }`
`342`	`346`	`}`
`343`	`347`
`344`	`348`	`protected String getDiscriminatorAlias() {`