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

HHH-7651 Default discriminator not created on insert

This commit is contained in:
brmeyer 2012-09-28 14:54:36 -04:00
parent e12ce42b2c
commit 691463578b
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/annotations/entity/EntityClass.java
View File

@ -235,7 +235,11 @@ public class EntityClass extends ConfiguredClass {
} }
public String getDiscriminatorMatchValue() { public String getDiscriminatorMatchValue() {
return discriminatorMatchValue; if ( discriminatorMatchValue == null) {
return getClassInfo().name().toString();
} else {
return discriminatorMatchValue;
}
} }
public List<JpaCallbackSource> getJpaCallbacks() { public List<JpaCallbackSource> getJpaCallbacks() {

22
hibernate-core/src/main/java/org/hibernate/persister/entity/SingleTableEntityPersister.java
View File

@ -53,6 +53,7 @@ import org.hibernate.mapping.Value;
import org.hibernate.metamodel.spi.binding.AttributeBinding; import org.hibernate.metamodel.spi.binding.AttributeBinding;
import org.hibernate.metamodel.spi.binding.CustomSQL; import org.hibernate.metamodel.spi.binding.CustomSQL;
import org.hibernate.metamodel.spi.binding.EntityBinding; import org.hibernate.metamodel.spi.binding.EntityBinding;
import org.hibernate.metamodel.spi.binding.EntityDiscriminator;
import org.hibernate.metamodel.spi.binding.RelationalValueBinding; import org.hibernate.metamodel.spi.binding.RelationalValueBinding;
import org.hibernate.metamodel.spi.binding.SingularAttributeBinding; import org.hibernate.metamodel.spi.binding.SingularAttributeBinding;
import org.hibernate.metamodel.spi.relational.DerivedValue; import org.hibernate.metamodel.spi.relational.DerivedValue;
@ -130,8 +131,6 @@ public class SingleTableEntityPersister extends AbstractEntityPersister {
private static final Object NULL_DISCRIMINATOR = new MarkerObject("<null discriminator>"); private static final Object NULL_DISCRIMINATOR = new MarkerObject("<null discriminator>");
private static final Object NOT_NULL_DISCRIMINATOR = new MarkerObject("<not null discriminator>"); private static final Object NOT_NULL_DISCRIMINATOR = new MarkerObject("<not null discriminator>");
private static final String NULL_STRING = "null";
private static final String NOT_NULL_STRING = "not null";
//INITIALIZATION: //INITIALIZATION:
@ -541,11 +540,12 @@ public class SingleTableEntityPersister extends AbstractEntityPersister {
// DISCRIMINATOR // DISCRIMINATOR
if ( entityBinding.isPolymorphic() ) { if ( entityBinding.isPolymorphic() ) {
org.hibernate.metamodel.spi.relational.Value discriminatorRelationalValue = entityBinding.getHierarchyDetails().getEntityDiscriminator().getRelationalValue(); EntityDiscriminator discriminator = entityBinding.getHierarchyDetails().getEntityDiscriminator();
org.hibernate.metamodel.spi.relational.Value discriminatorRelationalValue = discriminator.getRelationalValue();
if ( discriminatorRelationalValue == null ) { if ( discriminatorRelationalValue == null ) {
throw new MappingException("discriminator mapping required for single table polymorphic persistence"); throw new MappingException("discriminator mapping required for single table polymorphic persistence");
} }
forceDiscriminator = entityBinding.getHierarchyDetails().getEntityDiscriminator().isForced(); forceDiscriminator = discriminator.isForced();
if ( DerivedValue.class.isInstance( discriminatorRelationalValue ) ) { if ( DerivedValue.class.isInstance( discriminatorRelationalValue ) ) {
DerivedValue formula = ( DerivedValue ) discriminatorRelationalValue; DerivedValue formula = ( DerivedValue ) discriminatorRelationalValue;
discriminatorFormula = formula.getExpression(); discriminatorFormula = formula.getExpression();
@ -568,27 +568,21 @@ public class SingleTableEntityPersister extends AbstractEntityPersister {
discriminatorFormulaTemplate = null; discriminatorFormulaTemplate = null;
} }
discriminatorType = entityBinding.getHierarchyDetails() discriminatorType = discriminator
.getEntityDiscriminator()
.getExplicitHibernateTypeDescriptor() .getExplicitHibernateTypeDescriptor()
.getResolvedTypeMapping(); .getResolvedTypeMapping();
if ( entityBinding.getDiscriminatorMatchValue() == null ) { if ( entityBinding.isDiscriminatorMatchValueNull() ) {
discriminatorValue = NULL_DISCRIMINATOR; discriminatorValue = NULL_DISCRIMINATOR;
discriminatorSQLValue = InFragment.NULL; discriminatorSQLValue = InFragment.NULL;
discriminatorInsertable = false; discriminatorInsertable = false;
} }
else if ( entityBinding.getDiscriminatorMatchValue().equals( NULL_STRING ) ) { else if ( entityBinding.isDiscriminatorMatchValueNotNull() ) {
discriminatorValue = NOT_NULL_DISCRIMINATOR;
discriminatorSQLValue = InFragment.NOT_NULL;
discriminatorInsertable = false;
}
else if ( entityBinding.getDiscriminatorMatchValue().equals( NOT_NULL_STRING ) ) {
discriminatorValue = NOT_NULL_DISCRIMINATOR; discriminatorValue = NOT_NULL_DISCRIMINATOR;
discriminatorSQLValue = InFragment.NOT_NULL; discriminatorSQLValue = InFragment.NOT_NULL;
discriminatorInsertable = false; discriminatorInsertable = false;
} }
else { else {
discriminatorInsertable = entityBinding.getHierarchyDetails().getEntityDiscriminator().isInserted() discriminatorInsertable = discriminator.isInserted()
&& ! DerivedValue.class.isInstance( discriminatorRelationalValue ); && ! DerivedValue.class.isInstance( discriminatorRelationalValue );
try { try {
DiscriminatorType dtype = ( DiscriminatorType ) discriminatorType; DiscriminatorType dtype = ( DiscriminatorType ) discriminatorType;