Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix joined subclass discriminator column determination

This commit is contained in:
Andrea Boriero 2020-06-18 16:43:19 +01:00
parent 7fd6e4fbea
commit 23ffe42b6c
2 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
hibernate-core/src/main/java/org/hibernate/persister/entity/JoinedSubclassEntityPersister.java
View File

@ -157,6 +157,7 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
private final boolean[] isInverseTable;
private final Map<String, Object> discriminatorValuesByTableName;
private final Map<String, String> discriminatorColumnNameByTableName;
private final Map<String, String> subclassNameByTableName;
//INITIALIZATION:
@ -525,17 +526,36 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
int subclassSpan = persistentClass.getSubclassSpan() + 1;
subclassClosure = new String[subclassSpan];
subclassClosure[subclassSpan - 1] = getEntityName();
int subclassSpanMinusOne = subclassSpan - 1;
subclassClosure[subclassSpanMinusOne] = getEntityName();
if ( persistentClass.isPolymorphic() ) {
subclassesByDiscriminatorValue.put( discriminatorValue, getEntityName() );
discriminatorValuesByTableName = new LinkedHashMap<>( subclassSpan + 1 );
subclassNameByTableName = CollectionHelper.mapOfSize( subclassSpan + 1);
int initialCapacity = subclassSpan + 1;
discriminatorValuesByTableName = new LinkedHashMap<>( initialCapacity );
discriminatorColumnNameByTableName = new LinkedHashMap<>( initialCapacity );
subclassNameByTableName = CollectionHelper.mapOfSize( initialCapacity );
// We need to convert the `discriminatorSQLString` (which is a String read from boot-mapping) into
// the type indicated by `#discriminatorType` (String -> Integer, e.g.).
try {
Table table = persistentClass.getTable();
final Object convertedDiscriminatorValue = discriminatorType.stringToObject( discriminatorSQLString );
discriminatorValuesByTableName.put( persistentClass.getTable().getName(), convertedDiscriminatorValue );
discriminatorValues = new String[subclassSpan];
initDiscriminatorProperties( factory, jdbcEnvironment, subclassSpanMinusOne, table, convertedDiscriminatorValue
);
notNullColumnTableNumbers = new int[subclassSpan];
final int id = getTableId(
table.getQualifiedName(
factory.getDialect(),
factory.getSettings().getDefaultCatalogName(),
factory.getSettings().getDefaultSchemaName()
),
subclassTableNameClosure
);
notNullColumnTableNumbers[subclassSpanMinusOne] = id;
notNullColumnNames = new String[subclassSpan];
notNullColumnNames[subclassSpanMinusOne] = subclassTableKeyColumnClosure[id][0]; //( (Column) model.getTable().getPrimaryKey().getColumnIterator().next() ).getName();
}
catch (HibernateException e) {
throw e;
@ -547,24 +567,11 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
);
}
discriminatorValues = new String[subclassSpan];
discriminatorValues[subclassSpan - 1] = discriminatorSQLString;
notNullColumnTableNumbers = new int[subclassSpan];
final int id = getTableId(
persistentClass.getTable().getQualifiedName(
factory.getDialect(),
factory.getSettings().getDefaultCatalogName(),
factory.getSettings().getDefaultSchemaName()
),
subclassTableNameClosure
);
notNullColumnTableNumbers[subclassSpan - 1] = id;
notNullColumnNames = new String[subclassSpan];
notNullColumnNames[subclassSpan - 1] = subclassTableKeyColumnClosure[id][0]; //( (Column) model.getTable().getPrimaryKey().getColumnIterator().next() ).getName();
}
else {
subclassNameByTableName = Collections.EMPTY_MAP;
discriminatorValuesByTableName = Collections.EMPTY_MAP;
discriminatorColumnNameByTableName = Collections.EMPTY_MAP;
discriminatorValues = null;
notNullColumnTableNumbers = null;
notNullColumnNames = null;
@ -575,7 +582,8 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
while ( iter.hasNext() ) {
Subclass sc = (Subclass) iter.next();
subclassClosure[k] = sc.getEntityName();
subclassNameByTableName.put( sc.getTable().getName(), sc.getClassName() );
final Table table = sc.getTable();
subclassNameByTableName.put( table.getName(), sc.getClassName() );
try {
if ( persistentClass.isPolymorphic() ) {
final Object discriminatorValue;
@ -604,11 +612,10 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
// "foo.class = Bar" works in HQL
discriminatorValue = sc.getSubclassId();
}
discriminatorValuesByTableName.put( sc.getTable().getName(), discriminatorValue );
initDiscriminatorProperties( factory, jdbcEnvironment, k, table, discriminatorValue );
subclassesByDiscriminatorValue.put( discriminatorValue, sc.getEntityName() );
discriminatorValues[k] = discriminatorValue.toString();
int id = getTableId(
sc.getTable().getQualifiedName(
table.getQualifiedName(
factory.getDialect(),
factory.getSettings().getDefaultCatalogName(),
factory.getSettings().getDefaultSchemaName()
@ -635,6 +642,19 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
}
private void initDiscriminatorProperties(
SessionFactoryImplementor factory,
JdbcEnvironment jdbcEnvironment,
int k,
Table table,
Object discriminatorValue) {
final String tableName = determineTableName( table, jdbcEnvironment );
final String columnName = table.getPrimaryKey().getColumn( 0 ).getQuotedName( factory.getDialect() );
discriminatorValuesByTableName.put( tableName, discriminatorValue );
discriminatorColumnNameByTableName.put( tableName, columnName );
discriminatorValues[k] = discriminatorValue.toString();
}
/**
* Used to hold the name of subclasses that each "subclass table" is part of. For example, given a hierarchy like:
@ -1313,10 +1333,9 @@ public class JoinedSubclassEntityPersister extends AbstractEntityPersister {
private ColumnReference getIdentifierColumnReference(TableReference tableReference) {
final List<JdbcMapping> jdbcMappings = getIdentifierMapping().getJdbcMappings( getFactory().getTypeConfiguration() );
return new ColumnReference(
tableReference.getIdentificationVariable(),
getIdentifierColumnNames()[0],
discriminatorColumnNameByTableName.get( tableReference.getTableExpression() ),
jdbcMappings.get( 0 ),
getFactory()
);

8
hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/TableReference.java
View File

@ -6,15 +6,12 @@
*/
package org.hibernate.sql.ast.tree.from;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.function.Supplier;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.sql.ast.SqlAstWalker;
import org.hibernate.sql.ast.tree.SqlAstNode;
import org.hibernate.sql.ast.tree.expression.ColumnReference;
/**
* Represents a reference to a table (derived or physical) in a query's from clause.
@ -26,9 +23,6 @@ public class TableReference implements SqlAstNode, ColumnReferenceQualifier {
private final String identificationVariable;
private final boolean isOptional;
private final SessionFactoryImplementor sessionFactory;
private final Map<String, ColumnReference> columnReferenceResolutionMap = new HashMap<>();
public TableReference(
String tableExpression,
@ -38,7 +32,6 @@ public class TableReference implements SqlAstNode, ColumnReferenceQualifier {
this.tableExpression = tableExpression;
this.identificationVariable = identificationVariable;
this.isOptional = isOptional;
this.sessionFactory = sessionFactory;
}
public String getTableExpression() {
@ -100,4 +93,5 @@ public class TableReference implements SqlAstNode, ColumnReferenceQualifier {
public int hashCode() {
return Objects.hash( identificationVariable );
}
}